Merge branch 'master' into softproofing

2016-10-16 01:45:52 +02:00
parent 81c5b1ca41 29d5329f3f
commit 50165dab20
159 changed files with 15819 additions and 2723 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -120,6 +120,7 @@ public:
    bool editorFilmStripOpened;
    int historyPanelWidth;
    Glib::ustring font;
+    Glib::ustring colorPickerFont;
    int windowWidth;
    int windowHeight;
    int windowX;