merge with dev

2018-12-19 15:16:18 +01:00
parent 9f28cdf5ba 39d37a6ded
commit c3bd22f337
122 changed files with 1277 additions and 8235 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -375,6 +375,7 @@ public:
    int           fastexport_resize_height;
    bool fastexport_use_fast_pipeline;

+    std::vector<Glib::ustring> favorites;
    // Dialog settings
    Glib::ustring lastIccDir;
    Glib::ustring lastDarkframeDir;