Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -84,8 +84,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;