Merge branch 'master' into gtk3

2015-09-27 21:17:35 +02:00
parent 043ce3b573 e525fbb353
commit 6ef9f72d44
12 changed files with 458 additions and 465 deletions
--- a/rtgui/history.h
+++ b/rtgui/history.h
@@ -127,6 +127,7 @@ public:
    void redo ();

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

 #endif