Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal ...

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

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif

2021-12-07 13:31:55 -08:00

..

Editor

Removes some leftover log

2021-12-03 15:21:58 -08:00

Framework

Merge branch 'development' into redcode/driller_removal

2021-12-07 13:31:55 -08:00

LauncherUnified

Merging from development

2021-12-07 12:35:41 -08:00

Legacy

no message

2021-12-03 11:38:49 -08:00

Tools

Merging from development

2021-12-07 12:35:41 -08:00

CMakeLists.txt

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

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