Add background to merge file

2019-11-18 18:05:29 +01:00
parent a7cc1d2feb
commit bb9673db68
10 changed files with 257 additions and 17 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -844,6 +844,9 @@ enum ProcEventCode {
    Evlocallabslomaskvib = 817,
    Evlocallablapmaskvib = 818,
    EvlocallabLmaskvibshape = 819,
+    EvLocallabLabGridmergValue = 820,
+    Evlocallabmercol = 821,
+    Evlocallabmerlucol = 822,
    NUMOFEVENTS
 };