(no commit message)

diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index e389c038ce5f64bf8f1b1eb7a29fbdda864c331e..4fad09da30862dbc541f94a978de3c75821d5876 100644 (file)
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -40,7 +40,6 @@
 /*
 Include declarations.
 */
-#include <string.h>
 #include "MagickCore/studio.h"
 #include "MagickCore/artifact.h"
 #include "MagickCore/cache.h"
@@ -63,6 +62,7 @@ Include declarations.
 #include "MagickCore/monitor.h"
 #include "MagickCore/montage.h"
 #include "MagickCore/morphology.h"
+#include "MagickCore/nt-base.h"
 #include "MagickCore/opencl.h"
 #include "MagickCore/opencl-private.h"
 #include "MagickCore/option.h"
@@ -79,16 +79,6 @@ Include declarations.
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 
-#include <time.h>
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#include <limits.h>
-#endif
-
-
 #ifdef MAGICKCORE_CLPERFMARKER
 #include "CLPerfMarker.h"
 #endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b7f1c694b19096bee3f1cb68dab0b9d9bebb85e0..e55d6956101820be80df8ce69fef3144b04e10d5 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  "13764"
+#define MagickSVNRevision  "13810:13822M"
 #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  "2013-11-22"
+#define MagickReleaseDate  "2013-11-24"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/aclocal.m4 b/aclocal.m4
index 58f4bfa9ef95758853fa298d02ac361c8317a298..37c50cee55b570e82ce2766311cf217a71cf43ee 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -256,7 +256,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -447,7 +447,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -935,7 +935,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/config/compile b/config/compile
index a85b723c7e67d46316e85e7422bd5088e9136042..531136b068ef00e23d38429e6ee9a57d581a0870 100755 (executable)
--- a/config/compile
+++ b/config/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/config/depcomp b/config/depcomp
index fc98710e2a1df7159cd72a01ffc011784748c3bc..4ebd5b3a2f2d689de95251c9424e2763aa159de5 100755 (executable)
--- a/config/depcomp
+++ b/config/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/configure b/configure
index f049f9cbd272320d3fec6852265b5531ba760f60..5821faf952b97087e817f712f5842c82e48f2ccc 100755 (executable)
--- a/configure
+++ b/configure
@@ -3691,7 +3691,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=13764
+MAGICK_SVN_REVISION=13810:13822M
 
 
 # Substitute library versioning