merge master into retinexgain

2016-05-01 08:53:52 +02:00
parent 67a19d0cc9 c8db56643a
commit a742e3a7ba
221 changed files with 7954 additions and 6498 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -466,9 +466,11 @@ enum ProcEvent {
    EvmapMethod = 436,
    EvRetinexmapcurve = 437,
    EvviewMethod = 438,
-    EvRetinexgaintransmission = 439,
-    EvLskal = 440,
+    EvcbdlMethod = 439,
+    EvRetinexgaintransmission = 440,
+    EvLskal = 441,
    NUMOFEVENTS
+
 };
 }
 #endif