Merge branch 'master' into gtk3

2016-05-22 13:13:04 +02:00
parent 0074a5d429 4cf80e7c73
commit e737365597
27 changed files with 1186 additions and 925 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;