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

..

Editor

Merge branch 'development' into cmake/SPEC-7484

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

Framework

Merge branch 'development' into cmake/SPEC-7484

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

LauncherUnified

removing files that got added by rebase

2021-07-28 09:54:42 -07:00

Legacy

Merge branch 'development' into cmake/SPEC-7484

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

Tools

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