(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 43144d03fd18eedf3716301ce59145af570cad18..de434a7e7264b5570f233187d03dc8531f200706 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2743,24 +2743,24 @@ M4_EXTRA_DIST = \
 configsharedir = $(SHARE_CONFIGURE_PATH)
 configshare_DATA = \
        config/configure.xml \
-       config/delegates.xml \
        config/english.xml \
        config/francais.xml \
-       config/locale.xml \
-       config/coder.xml \
-       config/magic.xml \
-       config/mime.xml \
-       config/sRGB.icm \
-       config/thresholds.xml
+       config/locale.xml
 
 
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir = $(CONFIGURE_PATH)
 configlib_DATA = \
+       config/coder.xml \
        config/colors.xml \
+       config/delegates.xml \
        config/log.xml \
+       config/magic.xml \
+       config/mime.xml \
        config/policy.xml \
+       config/sRGB.icm \
+       config/thresholds.xml \
        config/type.xml \
        config/type-dejavu.xml \
        config/type-ghostscript.xml \

diff --git a/config/Makefile.am b/config/Makefile.am
index 9dbb8474b06e5acbfa2efdcba1eceb253f9072cd..cf4134fba116eaa0258ff92eb3f67576da8127a0 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -19,23 +19,23 @@
 configsharedir = $(SHARE_CONFIGURE_PATH)
 configshare_DATA = \
        config/configure.xml \
-       config/delegates.xml \
        config/english.xml \
        config/francais.xml \
-       config/locale.xml \
-       config/coder.xml \
-       config/magic.xml \
-       config/mime.xml \
-       config/sRGB.icm \
-       config/thresholds.xml
+       config/locale.xml
 
 # Where architecture-dependent configuration files get installed
 # (share/ImageMagick-version)
 configlibdir =  $(CONFIGURE_PATH)
 configlib_DATA = \
+       config/coder.xml \
        config/colors.xml \
+       config/delegates.xml \
        config/log.xml \
+       config/magic.xml \
+       config/mime.xml \
        config/policy.xml \
+       config/sRGB.icm \
+       config/thresholds.xml \
        config/type.xml \
        config/type-dejavu.xml \
        config/type-ghostscript.xml \

diff --git a/config/configure.xml b/config/configure.xml
index 1f4788e941db554d80c689131218a66263143e1f..38efdd88df6b5381cdbdec018d78f549b71390e8 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,2"/>
-  <configure name="SVN_REVISION" value="4111" />
-  <configure name="RELEASE_DATE" value="2011-03-30"/>
+  <configure name="SVN_REVISION" value="4126" />
+  <configure name="RELEASE_DATE" value="2011-03-31"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 41b07550eb80a9de8ca7392c6527c551162396c5..f12ff8d18e63252cb8d2664800b1acebf0935dd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -3451,7 +3451,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=4111
+MAGICK_SVN_REVISION=4126
 
 
 

diff --git a/magick/version.h b/magick/version.h
index fb7cdf43b02e9890939e943ea9b582d9e634e8fb..8faa146cdb665df60a3303ba58f69c244f3beda1 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4111"
+#define MagickSVNRevision  "4126"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-2"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-03-30"
+#define MagickReleaseDate  "2011-03-31"
 #define MagickChangeDate   "20110330"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)