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/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -544,6 +544,7 @@ public:
    bool working;
    bool output;
    bool outputIntent;
+    bool outputBPC;
    bool gamma;
    bool gampos;
    bool slpos;