Merge branch 'master' of github.com:Beep6581/RawTherapee

2016-01-09 14:47:36 +01:00
parent e36ccb018b 46d57426bc
commit ea926477e3
1 changed files with 1 additions and 1 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -85,7 +85,7 @@ protected:
    Gtk::Button* navPrev;

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

    ImageAreaPanel* iareapanel;
    PreviewHandler* previewHandler;