Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

2010-10-01 10:36:31 -07:00
parent d6d6d6ae23
commit bcd42c3fc2
68 changed files with 2285 additions and 756 deletions
--- a/rtengine/refreshmap.h
+++ b/rtengine/refreshmap.h
@@ -39,6 +39,7 @@
 #define EXIF           32768
 #define IPTC           32768
 #define EQUALIZER      3
+#define DIRPYREQUALIZER	3
 #define NONE           0

 #define M_INIT      128