Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 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;