Merge branch 'master' into gtk3

2015-12-01 18:59:59 +01:00
parent 72acf67304 e85da94b8e
commit 2e720bdeb8
34 changed files with 89 additions and 138 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -88,7 +88,6 @@ protected:
    ImageAreaPanel* iareapanel;
    PreviewHandler* previewHandler;
    PreviewHandler* beforePreviewHandler;   // for the before-after view
-    PreviewHandler* previewHandler2;
    Navigator* navigator;
    ImageAreaPanel* beforeIarea;    // for the before-after view
    Gtk::VBox* beforeBox;