Merge branch 'master' into gtk3

2017-01-02 02:48:45 +01:00
parent e9db962a5f d29a94c2a7
commit d702156f8a
20 changed files with 444 additions and 219 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -209,6 +209,7 @@ public:
    {
        return isProcessing;
    }
+    void updateProfiles(const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
    void updateTPVScrollbar (bool hide);
    void updateTabsUsesIcons (bool useIcons);
    void updateHistogramPosition (int oldPosition, int newPosition);