Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew ...

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

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h

2021-08-24 10:46:18 -07:00

..

AzToolsFramework

Merge branch 'development' into cmake/win_fix_wnew

2021-08-24 10:46:18 -07:00

Platform

removing unnecessary bigobj flags from files (its applied globally)

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

Tests

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

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

CMakeLists.txt

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

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