Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -283,7 +283,6 @@ public:
        settings.remove("Hotkeys/");
        settings.sync();
        settings.beginWriteArray(group);
-        int hotkeyCount = hotkeys.count();
        int saveIndex = 0;
        for (HotKey key : hotkeys)
        {