merge with dev

2019-03-03 18:20:16 +01:00
parent 2748cde1c1 9c9728ac95
commit 65a418ae27
10 changed files with 57 additions and 12 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -958,6 +958,7 @@ public:
        bool method;
        bool dualDemosaicAutoContrast;
        bool dualDemosaicContrast;
+        bool border;
        bool ccSteps;
        bool exBlackRed;
        bool exBlackGreen;