Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -89,7 +89,7 @@ ALLNORAW,         // EvHREnabled,
 ALLNORAW,         // EvHRAmount,
 ALLNORAW,         // EvHRMethod,
 ALL,              // EvWProfile,
-ALL,              // EvOProfile,
+OUTPUTPROFIL,     // EvOProfile,
 ALL,              // EvIProfile,
 TRANSFORM,        // EvVignetting,
 RGBCURVE,         // EvChMixer,