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
@@ -30,7 +30,7 @@ namespace QtForPython
        //! The path of the Qt plugins such as /qtlibs/plugins
        AZStd::string m_qtPluginsFolder;

-        //! The 'winId' of the main Qt window in the Lumberyard editor
+        //! The 'winId' of the main Qt window in the Open 3D Engine editor
        AZ::u64 m_mainWindowId;
    };