(no commit message)

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 8c0ed7d147bf3b60e04c05f8b9b343a4063a790d..64b2a90ba682d218864b4a15c015d27684a10419 100644 (file)
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -110,7 +110,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES =
        Magick++/lib/Magick++/Thread.h \
        Magick++/lib/Magick++/TypeMetric.h
 
-Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = \ 
+Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = \
        $(MAGICKPP_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
 
 magickpptopincdir = $(INCLUDE_PATH)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 82ba6e6e42a74f87415bbf826ad21f9b22406437..b28a52e792c85bebfc9ec10e2302c255063ab413 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "16207:16231M"
+#define MagickSVNRevision  "16302:16304M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-07-25"
+#define MagickReleaseDate  "2014-08-13"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/configure b/configure
index 075096623f4fb5e7b912d4bdf132bca8f7e22093..003d01b5a685799c5c71b1b7489159416c3e8b0e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=16207:16231M
+MAGICK_SVN_REVISION=16302:16304M
 
 
 # Substitute library versioning
@@ -4335,7 +4335,7 @@ fi
 AM_BACKSLASH='\'
 
 
-# versionning of library
+# versioning of library
 MAGICK_LIB_VERSION="0x"
 if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
   MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0

diff --git a/configure.ac b/configure.ac
index a502dabbda0fc772ec39d1f3038dc84cb3f48756..ede967412e240573ea6d8421db0b0d7c81652d38 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules
 # Enable support for silent build rules
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-# versionning of library
+# versioning of library
 MAGICK_LIB_VERSION="0x"
 if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
   MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0