synced with master (merged master into gtk3)

2015-10-17 16:23:10 +02:00
parent d8e4709458 26b5d4f25e
commit 35775f3b3f
98 changed files with 6601 additions and 1473 deletions
--- a/rtgui/history.h
+++ b/rtgui/history.h
@@ -127,7 +127,10 @@ public:
    void redo ();

    bool blistenerLock;
-    void resetSnapShotNumber() {bmnum = 1;};
+    void resetSnapShotNumber()
+    {
+        bmnum = 1;
+    };
 };

 #endif