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/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -537,7 +537,7 @@ enum ProcEvent {
    Evlocallabcurvactiv = 507,
    Evlocallabccshape = 508,
    EvlocallabqualitycurveMethod = 509,
-
+    EvWBtempBias = 510,
    NUMOFEVENTS