*** empty log message ***

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 74512fa..1c9de0a 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,8 @@
-2007-04-25  Yavor Doganov <yavor@gnu.org>  (tiny change)
+2007-04-25  Werner Lemberg  <wl@gnu.org>
+
+       * emacs.1: Replace -- with \(em.
+
+2007-04-25  Yavor Doganov  <yavor@gnu.org>  (tiny change)
 
        * emacs.1, etags.1: Escape some minus signs.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9506e44..1b3245e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,12 @@
-2007-04-25  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
+2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
 
-       * custom.el (defface): Doc fix.
+       * image-dired.el (image-dired-display-image): Derive image-type
+       from filename rather than assuming jpeg, in case no resizing was
+       needed.
 
-2007-04-24  Chong Yidong  <cyd@stupidchicken.com>
+2007-04-25  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
 
-       * progmodes/python.el: File removed due to unclear legal status.
+       * custom.el (defface): Doc fix.
 
 2007-04-24  J.D. Smith  <jdsmith@as.arizona.edu>