birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

Browse Source
This commit is contained in:
chcurran
2021-07-26 11:32:12 -07:00
parent a87318c52a 90e45a5bbd
commit 6f07a0b136
18558 changed files with 83466 additions and 200298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp
+3 -4
View File
@@ -1,12 +1,11 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "precompiled.h"
#include <AssetBuilderSDK/AssetBuilderBusses.h>
#include <AzCore/Asset/AssetDataStream.h>