Esteban Papp c805d443d2 Merge branch 'development' into cmake/warn_virtual ...

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

# Conflicts:
#	Code/Legacy/CryCommon/IConsole.h
#	Code/Legacy/CrySystem/LocalizedStringManager.h
#	Code/Legacy/CrySystem/XConsole.h
#	Code/Legacy/CrySystem/XConsoleVariable.h
#	Code/Legacy/CrySystem/XML/XmlUtils.cpp
#	cmake/Platform/Common/Clang/Configurations_clang.cmake

2021-09-07 18:42:40 -07:00

..

Editor

Merge branch 'development' into cmake/warn_virtual

2021-09-07 18:42:40 -07:00

Framework

Merge branch 'development' into cmake/warn_virtual

2021-09-07 18:42:40 -07:00

LauncherUnified

Enabling warnings around format security

2021-09-07 15:17:40 -07:00

Legacy

Merge branch 'development' into cmake/warn_virtual

2021-09-07 18:42:40 -07:00

Tools

Merge branch 'development' into cmake/warn_virtual

2021-09-07 18:42:40 -07:00

CMakeLists.txt

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

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