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/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -590,7 +590,9 @@ enum ProcEvent {
    Evlocallabshcompr = 560,
    Evlocallabsensiex = 561,
    Evlocallabshape = 562,
-
+    EvCATtempout = 563,
+    EvCATgreenout = 564,
+    EvCATybout = 565,

    NUMOFEVENTS