minor imagemagick tweaks, one configure bugfix, and some ChangeLogs

1 files changed, 4 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e2d707300ad..5a8408316ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-18 Joakim Verona <joakim@verona.se>
+
+        * config.in, Makefile.in, configure.in: Checks for ImageMagick.
+
 2010-08-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * configure.in (AC_PREREQ): Require autoconf 2.65.
@@ -139,21 +143,6 @@
 
         * Makefile.in (install-arch-indep): Delete any old info .gz files first.
 
-2010-06-12 Joakim Verona <joakim@verona.se>
-
-        * image.c: Add support for ImageMagick. When HAVE_IMAGEMAGICK is
-        defined:
-        (imagemagick_image_p): New function to test for ImageMagic img.
-        (imagemagick_load): New function to load ImageMagick img.
-        (imagemagick_load_image): New function, helper for imagemagick_load
-        (imagemagick-types): New function.
-        (Qimagemagick): New Lisp_object.
-        (imagemagick-render-type): New var, decides which renderer to use
-        * image.el:
-        (imagemagick-types-inhibit): New var.
-        (imagemagick-register-types): New function.
-        * config.in, Makefile.in, configure.in
-
 2010-06-11  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (--without-compress-info): New option.