Merge branch 'master' into feature/animation-fixes

This commit is contained in:
Malin E
2021-10-25 10:51:13 +02:00
73 changed files with 5077 additions and 916 deletions
+1 -1
View File
@@ -134,7 +134,7 @@ void create() {
ghoul_assert(eventEngine, "No eventEngine");
currentPos += sizeof(EventEngine);
#else // ^^^ WIN32 / !WIN32 vvv
downloadManager = new EventEngine;
eventEngine = new EventEngine;
#endif // WIN32
#ifdef WIN32