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
@@ -242,7 +242,7 @@ public:

    virtual bool HotKey_LoadExisting() override
    {
-        QSettings settings("Amazon", "Lumberyard");
+        QSettings settings("Amazon", "O3DE");
        QString group = "Hotkeys/";

        HotKey_BuildDefaults();
@@ -278,7 +278,7 @@ public:

    virtual void HotKey_SaveCurrent() override
    {
-        QSettings settings("Amazon", "Lumberyard");
+        QSettings settings("Amazon", "O3DE");
        QString group = "Hotkeys/";
        settings.remove("Hotkeys/");
        settings.sync();