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

..

Android

Merge branch 'development' into cmake/AddressSanitizer

2021-08-19 11:44:28 -07:00

AppleTV/AzCore/IO/Streamer

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

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

Common

fixing format strings

2021-08-20 18:39:00 -07:00

iOS

Merge branch 'development' into cmake/AddressSanitizer

2021-08-19 11:44:28 -07:00

Linux

Linux and non-unity build fixes

2021-08-18 11:09:14 -07:00

Mac

Merge branch 'development' into cmake/AddressSanitizer

2021-08-19 11:44:28 -07:00

Windows

Merge branch 'development' into cmake/win_fix_wnew

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