changeset 32441:1a0a4c838030

*** empty log message ***
author Miles Bader <miles@gnu.org>
date Fri, 13 Oct 2000 01:34:00 +0000
parents 4e98e54082d2
children 0c5fc183b211
files lisp/ChangeLog
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Oct 13 01:33:19 2000 +0000
+++ b/lisp/ChangeLog	Fri Oct 13 01:34:00 2000 +0000
@@ -1,3 +1,8 @@
+2000-10-13  Miles Bader  <miles@lsi.nec.co.jp>
+
+	* image-file.el (image-file-name-extensions) 
+	(image-file-name-regexps): Add autoload cookies.
+
 2000-10-13  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule-cmds.el (select-safe-coding-system): If FROM
@@ -29,7 +34,6 @@
 	(cperl-invalid-face): Revert last change.
 	(cperl-init-faces): Quote cperl-invalid-face.
 
->>>>>>> 1.1252
 2000-10-12  Kenichi Handa  <handa@etl.go.jp>
 
 	* startup.el (fancy-splash-text): Remove superfluous quote.