merge with dev

2019-11-28 06:50:05 +01:00
parent f5a5b9a3f5 55709bc449
commit d645dc5951
75 changed files with 181 additions and 213 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -53,6 +53,7 @@
 #else
 #include <glibmm/thread.h>
 #include "conio.h"
+#include "windows.h"
 #endif

 // Set this to 1 to make RT work when started with Eclipse and arguments, at least on Windows platform