merge with dev

2018-08-05 09:05:47 +02:00
parent a4c92ac986 263d96eeca
commit 5472673b9e
146 changed files with 6196 additions and 2570 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -100,7 +100,7 @@ static void myGdkLockEnter()
 }
 static void myGdkLockLeave()
 {
-    // Automatic gdk_flush for non main tread
+    // Automatic gdk_flush for non main thread
 #if AUTO_GDK_FLUSH
    //if (Glib::Thread::self() != mainThread) {
    //    gdk_flush();