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/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -572,6 +572,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
        Gtk::Allocation alloc;
        iareapanel->imageArea->on_resized(alloc);
    }
+    history->resetSnapShotNumber();
 }

 void EditorPanel::close ()