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.

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
..
ComponentEntityEditorPlugin	more fixes for w4267	5 years ago
EditorAssetImporter	Code/Editor	5 years ago
EditorCommon	Merge branch 'development' into cmake/SPEC-7179	5 years ago
FFMPEGPlugin	removing files that got added by rebase	5 years ago
PerforcePlugin	Sandbox	5 years ago
ProjectSettingsTool	fixing no unity builds	5 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago