You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
o3de/Code/Tools
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
5 years ago
..
AWSNativeSDKInit Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Android/ProjectBuilder Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
AssetBundler Code/Tools 5 years ago
AssetProcessor Merge branch 'development' into cmake/SPEC-7484 5 years ago
AzTestRunner Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
CrashHandler Gems/Maestro 5 years ago
DeltaCataloger Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
GridHub linux fixes 5 years ago
ProjectManager Always display all gems in Gem Catalog (#2341) 5 years ago
PythonBindingsExample Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
RemoteConsole Merge branch 'development' into cmake/SPEC-7484 5 years ago
SceneAPI Merge branch 'development' into cmake/SPEC-7484 5 years ago
SerializeContextTools Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago
Standalone More string fixes 5 years ago
TestImpactFramework Merge branch 'development' into cmake/SPEC-7484 5 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago