Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused ...

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

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp

2021-08-25 14:50:05 -07:00

..

ComponentEntityEditorPlugin

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-25 14:50:05 -07:00

EditorAssetImporter

Refactor budget definitions as named functions instead of template specializations

2021-08-24 15:07:30 -06:00

EditorCommon

Merge branch 'development' into cmake/AddressSanitizer

2021-08-19 12:25:41 -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