Merge branch 'master' into jgrpp-beta

# Conflicts: # .github/workflows/ci-build.yml # CMakeLists.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/korean.txt # src/lang/norwegian_bokmal.txt # src/lang/russian.txt # src/lang/spanish.txt # src/misc_gui.cpp # src/newgrf.cpp
2021-10-28 23:51:24 +01:00
parent 81290df946 909f3f25bd
commit da282c3ecc
44 changed files with 315 additions and 216 deletions
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,6 +17,7 @@
 #include <mutex>
 #if defined(__MINGW32__)
 #include "3rdparty/mingw-std-threads/mingw.thread.h"
+#include "3rdparty/mingw-std-threads/mingw.mutex.h"
 #endif

 /**