merge with dev

2018-01-14 12:26:00 +01:00
parent 90d4767ad0 b762804b80
commit 90bd7fa98d
28 changed files with 869 additions and 283 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -171,6 +171,10 @@ public:
    bool satlow;
    bool sathigh;
    bool lumamode;
+    bool labgridALow;
+    bool labgridBLow;
+    bool labgridAHigh;
+    bool labgridBHigh;
 };

 class SharpenEdgeParamsEdited