Merging latest origin

2021-05-07 16:28:11 -07:00
parent 80f6dcd258 4c453bf4b6
commit 1df2fe1d48
141 changed files with 2843 additions and 1178 deletions
@@ -77,7 +77,7 @@ unsigned int g_EnableMultipleAssert = 0;//set to something else than 0 if to ena
 #endif

 #if defined(APPLE)
-    #include "../CrySystem/SystemUtilsApple.h"
+    #include <AzFramework/Utils/SystemUtilsApple.h>
 #endif

 #include "StringUtils.h"