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.
o3de/Code
Esteban Papp ddbcc68106 Merge branch 'development' into memory/overrideshim_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp
#	Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp
#	Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp
#	Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
#	Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
#	Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp
4 years ago
..
Editor Removed some unused classes from Editor/Controls 4 years ago
Framework Merge branch 'development' into memory/overrideshim_removal 4 years ago
LauncherUnified Removal of OverrideShim, AP seems to be crashing 4 years ago
Legacy Merge branch 'development' into memory/overrideshim_removal 4 years ago
Tools [Linux] Correct handling of new dirs added to non-recursive watch roots 4 years ago
CMakeLists.txt Shorten copyright headers by splitting into 2 lines (#2213) 5 years ago