(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d7efeb3781cc4e4b55264062c48deba139f13042..b834ac40116d74d9b984b76599865b19a99cbbc9 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  "16339:16343M"
+#define MagickSVNRevision  "16368:16375M"
 #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-08-21"
+#define MagickReleaseDate  "2014-08-26"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/Makefile.in b/Makefile.in
index ba3dfd75a959e8501294d2666453c87a63b73f0d..78652eff07a96d89437a046e31acf0657e321ff0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3058,6 +3058,7 @@ configlib_DATA = \
        config/type-windows.xml
 
 CONFIG_EXTRA_DIST = \
+       config/cmyk.icm \
        config/coder.xml \
        config/colors.xml \
        config/config.h.in \
@@ -3073,6 +3074,7 @@ CONFIG_EXTRA_DIST = \
        config/mime.xml \
        config/policy.xml \
        config/quantization-table.xml \
+       config/sRGB.icm \
        config/thresholds.xml \
        config/type-dejavu.xml.in \
        config/type-ghostscript.xml.in \

diff --git a/config/Makefile.am b/config/Makefile.am
index 903916d8d73cf66fac4ea71f71069aa343afd155..6718df4cf8dc2b7ba908f1b0b492e70b0fb000c2 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -47,6 +47,7 @@ configlib_DATA = \
        config/type-windows.xml
 
 CONFIG_EXTRA_DIST = \
+       config/cmyk.icm \
        config/coder.xml \
        config/colors.xml \
        config/config.h.in \
@@ -62,6 +63,7 @@ CONFIG_EXTRA_DIST = \
        config/mime.xml \
        config/policy.xml \
        config/quantization-table.xml \
+       config/sRGB.icm \
        config/thresholds.xml \
        config/type-dejavu.xml.in \
        config/type-ghostscript.xml.in \

diff --git a/config/cmyk.icm b/config/cmyk.icm
new file mode 100644 (file)
index 0000000..7f07077
Binary files /dev/null and b/config/cmyk.icm differ

diff --git a/config/sRGB.icm b/config/sRGB.icm
new file mode 100644 (file)
index 0000000..5491330
Binary files /dev/null and b/config/sRGB.icm differ

diff --git a/configure b/configure
index ab28282105f23f20531d90421212995cd67b01d8..136fe1dd64f8ed0760da7df8116d16e0bb489720 100755 (executable)
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=16339:16343M
+MAGICK_SVN_REVISION=16368:16375M
 
 
 # Substitute library versioning