(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index dd6533be45aa23b1efc09f47ac47653b67d86989..30ee7ad3e4839c1bb03f8092ae4b79b0f4be0e2e 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9382:9384M"
+#define MagickSVNRevision  "9390:9394M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-09-16"
+#define MagickReleaseDate  "2012-09-19"
 #define MagickChangeDate   "20120911"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index 8cbeddefc09822fae532f6bbffb60ddf20a8b5b1..c89a5137acc60bba37ec5e074e1d7884166c419b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,6 +261,7 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
        $(top_srcdir)/PerlMagick/Makefile.PL.in \
        $(top_srcdir)/PerlMagick/check.sh.in \
        $(top_srcdir)/config/ImageMagick.rdf.in \
+       $(top_srcdir)/config/Magick++.dox.in \
        $(top_srcdir)/config/MagickCore.dox.in \
        $(top_srcdir)/config/MagickWand.dox.in \
        $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
@@ -330,15 +331,16 @@ CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = common.shi config/configure.xml \
        config/delegates.xml config/ImageMagick.rdf \
        config/MagickCore.dox config/MagickWand.dox \
-       config/type-dejavu.xml config/type-ghostscript.xml \
-       config/type-windows.xml config/type.xml ImageMagick.spec \
-       Magick++/bin/Magick++-config MagickCore/ImageMagick.pc \
-       Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \
-       MagickCore/MagickCore-config MagickCore/MagickCore.pc \
-       MagickCore/version.h magick.sh PerlMagick/Magick.pm \
-       PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 \
-       utilities/compare.1 utilities/composite.1 utilities/conjure.1 \
-       utilities/convert.1 utilities/display.1 utilities/identify.1 \
+       config/Magick++.dox config/type-dejavu.xml \
+       config/type-ghostscript.xml config/type-windows.xml \
+       config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \
+       MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc \
+       Magick++/lib/Magick++.pc MagickCore/MagickCore-config \
+       MagickCore/MagickCore.pc MagickCore/version.h magick.sh \
+       PerlMagick/Magick.pm PerlMagick/Makefile.PL \
+       PerlMagick/check.sh utilities/animate.1 utilities/compare.1 \
+       utilities/composite.1 utilities/conjure.1 utilities/convert.1 \
+       utilities/display.1 utilities/identify.1 \
        utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 \
        utilities/montage.1 utilities/stream.1 \
        MagickWand/MagickWand-config MagickWand/MagickWand.pc
@@ -5121,6 +5123,8 @@ config/MagickCore.dox: $(top_builddir)/config.status $(top_srcdir)/config/Magick
        cd $(top_builddir) && $(SHELL) ./config.status $@
 config/MagickWand.dox: $(top_builddir)/config.status $(top_srcdir)/config/MagickWand.dox.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+config/Magick++.dox: $(top_builddir)/config.status $(top_srcdir)/config/Magick++.dox.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 config/type-dejavu.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-dejavu.xml.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 config/type-ghostscript.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-ghostscript.xml.in

diff --git a/configure b/configure
index 9940d0f5789cf7faaeb6267ad25d48a83bdb82c5..315b221e8a46ad9415b023f5ffca1f2fa16833b8 100755 (executable)
--- a/configure
+++ b/configure
@@ -3670,7 +3670,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=9382:9384M
+MAGICK_SVN_REVISION=9390:9394M