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

2021-08-11 07:55:26 -07:00

..

ComponentEntityEditorPlugin

Editor code: tidy up BOOLs,NULLs and overrides pt2.

2021-08-09 15:29:54 +01:00

EditorAssetImporter

Code/Editor

2021-08-02 17:56:56 -07:00

EditorCommon

Minimal TypeInfo header/reduce std interdependencies. (#2688)

2021-08-10 19:07:01 -05:00

FFMPEGPlugin

Merge branch 'development' into cmake/SPEC-7484

2021-08-10 09:23:34 -07:00

PerforcePlugin

[development] removal of unused and low stakes code related to Cry-threading (#2896)

2021-08-06 13:23:14 -07:00

ProjectSettingsTool

Merge branch 'development' into cmake/SPEC-7484

2021-08-10 09:23:34 -07:00

CMakeLists.txt

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

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