Try to solve conflit

2016-01-03 16:56:21 +01:00
parent 4e229fe928 4d6833c43c
commit edd88be82c
13 changed files with 67 additions and 46 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -454,19 +454,19 @@ enum ProcEvent {
    EvLbaselog = 424,
 //    EvLgrbl = 425,
    EvRetinexlhcurve = 425,
-    EvLiter = 426,
-    EvLgrad = 427,
-    EvLgrads = 428,
-    EvLhighlights = 429,
-    EvLh_tonalwidth = 430,
-    EvLshadows = 431,
-    EvLs_tonalwidth = 432,
-    EvLradius = 433,
-    EvmapMethod = 434,
-    EvRetinexmapcurve = 435,
-    EvviewMethod = 436,
-    EvOIntent = 437,
-    EvMonitorTransform = 438,
+    EvOIntent = 426,
+    EvMonitorTransform = 427,
+    EvLiter = 428,
+    EvLgrad = 429,
+    EvLgrads = 430,
+    EvLhighlights = 431,
+    EvLh_tonalwidth = 432,
+    EvLshadows = 433,
+    EvLs_tonalwidth = 434,
+    EvLradius = 435,
+    EvmapMethod = 436,
+    EvRetinexmapcurve = 437,
+    EvviewMethod = 438,
    NUMOFEVENTS
 };
 }