You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h # Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h # Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp # Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp		4 years ago
..
CryCommon	Merge branch 'development' into cmake/linux_fix_warn_unused	4 years ago
CrySystem	Code/Legacy	4 years ago
CMakeLists.txt	Shorten copyright headers by splitting into 2 lines (#2213)	4 years ago