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/addsetids.h
+++ b/rtgui/addsetids.h
@@ -128,6 +128,8 @@ enum {
    ADDSET_LOCALLAB_TRANSIT,
    ADDSET_LOCALLAB_STRENGTH,
    ADDSET_LOCALLAB_SENSI,
+    ADDSET_WB_TEMPBIAS,
+
    ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
 };