Merge branch 'master' into gtk3

2016-10-16 23:26:51 +02:00
parent a6fc7cd37d 50165dab20
commit 4efae5c764
53 changed files with 4404 additions and 857 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -269,6 +269,7 @@ public:
    Glib::ustring fastexport_icm_working;
    Glib::ustring fastexport_icm_output;
    rtengine::RenderingIntent fastexport_icm_outputIntent;
+    bool          fastexport_icm_outputBPC;
    Glib::ustring fastexport_icm_gamma;
    bool          fastexport_resize_enabled;
    double        fastexport_resize_scale;