Merge branch 'master' into gtk3

2016-01-11 00:54:25 +01:00
parent a4d49ee5f2 5ff270bf51
commit a54dd81b1a
69 changed files with 1940 additions and 1001 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -86,7 +86,7 @@ protected:
    Gtk::Button* navPrev;

    class MonitorProfileSelector;
-    std::auto_ptr<MonitorProfileSelector> monitorProfile;
+    std::unique_ptr<MonitorProfileSelector> monitorProfile;

    ImageAreaPanel* iareapanel;
    PreviewHandler* previewHandler;