Merge branch 'main' into platform/SPEC-6061

This commit is contained in:
spham
2021-04-16 21:32:08 -07:00
21 changed files with 657 additions and 767 deletions
@@ -17,6 +17,7 @@
*/Code/Framework/AzCore/AzCore/Math/VectorFloat.h
*/Code/Framework/AzCore/AzCore/Memory/dlmalloc.inl
*/Code/Framework/AzCore/AzCore/Memory/nedmalloc.inl
*/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.*
*/Code/Framework/AzCore/AzCore/PlatformDef.h
*/Code/Framework/AzCore/AzCore/std/containers/compressed_pair.h
*/Code/Framework/AzCore/AzCore/std/containers/variant.h