# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1200316831 0
# Node ID b25af1b3c086819c2712962c972dcbbe63f51530
# Parent  f4af1399e6f64ba692d7bed86b7de2d0a5b24d4b
*** empty log message ***

diff -r f4af1399e6f6 -r b25af1b3c086 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 14 13:19:28 2008 +0000
+++ b/lisp/ChangeLog	Mon Jan 14 13:20:31 2008 +0000
@@ -1,3 +1,8 @@
+2008-01-14  Jason Rumney  <jasonr@gnu.org>
+
+	* image.el (image-type): Use image-type-from-file-name (from trunk
+	2007-05-21  Chong Yidong  <cyd@stupidchicken.com>).
+
 2008-01-12  Glenn Morris  <rgm@gnu.org>
 
 	* woman.el (woman-parse-numeric-arg): Change handling of `==':