Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual ...

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

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h

2021-09-14 15:32:35 -07:00

..

AtomCore

Merge branch 'development' into cmake/linux_fix_warn_unused

2021-08-24 11:49:35 -07:00

AzAndroid/java/com/amazon

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

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

AzCore

Merge branch 'development' into cmake/warn_virtual

2021-09-14 15:32:35 -07:00

AzFramework

Merge branch 'development' into cmake/warn_virtual

2021-09-14 15:32:35 -07:00

AzGameFramework

ATOM-16346 Change Atom setreg path (#3690)

2021-08-30 14:57:46 -07:00

AzManipulatorTestFramework

Merge branch 'development' into cmake/warn_virtual

2021-09-14 10:28:58 -07:00

AzNetworking

more fixes

2021-09-08 08:48:32 -07:00

AzQtComponents

Merge branch 'development' into cmake/warn_virtual

2021-09-14 15:32:35 -07:00

AzTest

more Code/Framework fixes

2021-09-07 18:37:45 -07:00

AzToolsFramework

Merge branch 'development' into cmake/warn_virtual

2021-09-14 15:32:35 -07:00

GFxFramework

More fixes

2021-09-08 16:50:57 -07:00

GridMate

Merge branch 'development' into cmake/warn_virtual

2021-09-09 11:50:40 -07:00

CMakeLists.txt

Remove crcfix (#3294)

2021-08-18 12:38:00 -07:00