merge with dev - all warnings are not delete - come soon

2017-04-08 19:28:04 +02:00
parent 6608d5147c 73e14702dd
commit 398e862b2b
144 changed files with 5970 additions and 5235 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -290,6 +290,7 @@ public:
    int           fastexport_resize_dataspec;
    int           fastexport_resize_width;
    int           fastexport_resize_height;
+    bool fastexport_use_fast_pipeline;

    // Dialog settings
    Glib::ustring lastIccDir;