Merge remote-tracking branch 'origin/master'

2020-10-27 22:41:02 +03:00
parent 3683ae4af2 9ad3fb3eca
commit c5c3c6b464
3 changed files with 1 additions and 1 deletions
--- a/media/splash.png
+++ b/media/splash.png
--- a/resources/noggit_font.ttf
+++ b/resources/noggit_font.ttf
--- a/src/noggit/World.cpp
+++ b/src/noggit/World.cpp
@@ -28,7 +28,7 @@
 #include <boost/thread/thread.hpp>

 #include <QtWidgets/QMessageBox>
-#include <QTCore/QDir>
+#include <QDir>

 #include <algorithm>
 #include <cassert>