merge with dev

2018-10-19 19:26:14 +02:00
parent bda6ad9235 72699902a3
commit e7448bd084
198 changed files with 2052 additions and 1128 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -402,12 +402,12 @@ class SHParamsEdited

 public:
    bool enabled;
-    bool hq;
    bool highlights;
    bool htonalwidth;
    bool shadows;
    bool stonalwidth;
    bool radius;
+    bool lab;
 };

 class CropParamsEdited