Merge with dev - save provisory work

2017-12-09 14:32:32 +01:00
parent 5748d98678 d668e0d745
commit 392d2a6769
50 changed files with 2095 additions and 2117 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -617,6 +617,7 @@ enum ProcEvent {
    Evlocallabexclumethod = 586,
    Evlocallabsensiexclu = 587,
    Evlocallabstruc = 588,
+    Evlocallabwarm = 589,

    NUMOFEVENTS