merge with dev

2018-01-26 18:00:33 +01:00
parent 62d9825bce 24151b313a
commit 4a29e34e20
51 changed files with 591 additions and 377 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -389,6 +389,7 @@ public:
    bool enabled;
    bool threshold;
    bool amount;
+    bool anchor;
 };