Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -357,7 +357,7 @@ void android_main(android_app* appState)
    AZ::Android::Utils::ShowSplashScreen();

    // run the Lumberyard application
-    using namespace LumberyardLauncher;
+    using namespace O3DELauncher;
    
    PlatformMainInfo mainInfo;
    mainInfo.m_updateResourceLimits = IncreaseResourceLimits;