Merge remote-tracking branch 'origin/noggit-shadowlands' into noggit-shadowlands

2021-12-12 11:38:26 +03:00
parent 24042aef9a fa0c7672b2
commit 059047db6f
22 changed files with 415 additions and 289 deletions
--- a/src/noggit/map_index.cpp
+++ b/src/noggit/map_index.cpp
@@ -14,7 +14,7 @@
 #endif
 #include <noggit/map_index.hpp>
 #include <noggit/uid_storage.hpp>
-#include <noggit/application.hpp>
+#include <noggit/application/NoggitApplication.hpp>
 #include <ClientFile.hpp>

 #include <QtCore/QSettings>