Mercurial > emacs

diff ChangeLog @ 110001:87dd0fd298be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 22 Aug 2010 22:56:05 +0000
parents df9d0b151262
children 16358be4a799
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 19 22:47:51 2010 +0000
+++ b/ChangeLog	Sun Aug 22 22:56:05 2010 +0000
@@ -1,3 +1,7 @@
+2010-08-18  Joakim Verona  <joakim@verona.se>
+
+	* 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.