Esteban Papp e28d04aea6 Merge branch 'development' into cmake/SPEC-7484 ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Editor/CryEditDoc.h
#	Code/Legacy/CryCommon/CryArray.h
#	Code/Legacy/CryCommon/CryString.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CrySystem/LocalizedStringManager.cpp
#	Gems/LyShine/Code/Source/StringUtfUtils.h
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp

2021-08-05 20:05:25 -07:00

..

Android/ProjectBuilder

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

AssetBundler

Code/Tools

2021-07-27 19:31:55 -07:00

AssetProcessor

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

AWSNativeSDKInit

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

AzTestRunner

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

CrashHandler

Gems/Maestro

2021-08-02 11:44:34 -07:00

DeltaCataloger

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

GridHub

linux fixes

2021-08-03 17:59:35 -07:00

ProjectManager

Always display all gems in Gem Catalog (#2341)

2021-08-03 10:48:57 -07:00

PythonBindingsExample

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

RemoteConsole

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

SceneAPI

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

SerializeContextTools

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00

Standalone

More string fixes

2021-07-29 15:53:32 -07:00

TestImpactFramework

Merge branch 'development' into cmake/SPEC-7484

2021-08-05 20:05:25 -07:00

CMakeLists.txt

Shorten copyright headers by splitting into 2 lines (#2213)

2021-07-16 15:25:48 -07:00