Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244 ...

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

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp

2021-08-17 12:10:46 -07:00

..

ComponentEntityEditorPlugin

Code/Editor

2021-08-16 16:42:30 -07:00

EditorAssetImporter

Merge branch 'development' into cmake/SPEC-2513_w4244

2021-08-17 12:10:46 -07:00

EditorCommon

more fixes, will merge fixes for w4245 and w4389

2021-08-16 16:06:22 -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