merge with dev - I hope no error

2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -234,6 +234,7 @@ public:
    bool temperature;
    bool green;
    bool equal;
+    bool tempBias;
 };

 /*class ColorShiftParamsEdited {