Esteban Papp 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer ...

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/LegacyAllocator.h

2021-08-19 11:44:28 -07:00

..

ComponentEntityEditorPlugin

Deprecate profiler categories based on global enum

2021-08-18 17:33:09 -06:00

EditorAssetImporter

Deprecate profiler categories based on global enum

2021-08-18 17:33:09 -06:00

EditorCommon

missing header includes

2021-08-17 18:02:49 -07:00

FFMPEGPlugin

Merge branch 'development' into cmake/SPEC-7484

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

PerforcePlugin

[redcode/crythread-2nd-pass] replaced instances of AZStd::lock_guard<> with AZStd::scoped_lock as per feedback

2021-08-12 12:40:03 -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