# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 944704886 0
# Node ID 409c955897d78b5694be16d44285d2518b88eb53
# Parent  1cf89c82df784b3948370de69e15086f2755e1b1
*** empty log message ***

diff -r 1cf89c82df78 -r 409c955897d7 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 09 02:00:20 1999 +0000
+++ b/lisp/ChangeLog	Thu Dec 09 02:01:26 1999 +0000
@@ -1,3 +1,7 @@
+1999-12-08  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+	* dired-aux.el (dired-insert-subdir): Add autoload cookie.
+
 1999-12-07  Dave Love  <fx@gnu.org>
 
 	* help.el (view-emacs-problems): New command, bound to C-h P.
@@ -130,7 +134,6 @@
 	tags-recognize-empty-tags-table.
 	(complete-tag): Call tags-complete-tag bypassing try-completion.
 	
->>>>>>> 1.221
 1999-12-06  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule.el (set-buffer-file-coding-system): Docstring
@@ -232,6 +235,7 @@
 
 	* delsel.el: Grok skeleton-pair-insert-maybe.
 
+>>>>>>> 1.224
 1999-11-30  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
 	* progmodes/cperl-mode.el (cperl-under-as-char):