Merge branch 'master' into gtk3

2016-10-16 23:26:51 +02:00
parent a6fc7cd37d 50165dab20
commit 4efae5c764
53 changed files with 4404 additions and 857 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -85,8 +85,8 @@ protected:
    Gtk::Button* navNext;
    Gtk::Button* navPrev;

-    class MonitorProfileSelector;
-    std::unique_ptr<MonitorProfileSelector> monitorProfile;
+    class ColorManagementToolbar;
+    std::unique_ptr<ColorManagementToolbar> colorMgmtToolBar;

    ImageAreaPanel* iareapanel;
    PreviewHandler* previewHandler;