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 9f7d280a1e Merge branch 'development' into cmake/SPEC-7484 ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/ResourceSelectorHost.cpp		4 years ago
..
ComponentEntityEditorPlugin	Editor code: tidy up BOOLs,NULLs and overrides pt2.	4 years ago
EditorAssetImporter	Code/Editor	4 years ago
EditorCommon	Minimal TypeInfo header/reduce std interdependencies. (#2688)	4 years ago
FFMPEGPlugin	Merge branch 'development' into cmake/SPEC-7484	4 years ago
PerforcePlugin	[development] removal of unused and low stakes code related to Cry-threading (#2896)	4 years ago
ProjectSettingsTool	Merge branch 'development' into cmake/SPEC-7484	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	5 years ago