merge with dev manually

2017-08-15 09:57:19 +02:00
parent 47ed067c70 411b7b5975
commit 9b0c008006
15 changed files with 2241 additions and 1923 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -311,6 +311,10 @@ public:
    bool datacie;
    bool tonecie;
 //  bool sharpcie;
+    bool tempout;
+    bool greenout;
+    bool ybout;
+
 };

 class DirPyrDenoiseParamsEdited