Merge branch 'master' into spot-removal-tool

2016-10-07 13:55:59 +02:00
parent 56dafcf8c1 897b9d92ee
commit 6b22cbd831
192 changed files with 21297 additions and 13713 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -78,9 +78,10 @@ public:
    bool limd;
    bool highl;
    bool baselog;
-//    bool grbl;
+    bool skal;
    bool method;
    bool transmissionCurve;
+    bool gaintransmissionCurve;
    bool cdcurve;
    bool mapcurve;
    bool cdHcurve;