Mercurial > hg > xemacs-beta
diff lisp/ChangeLog @ 866:613552a02607
[xemacs-hg @ 2002-06-04 17:39:43 by andyp]
fix 21.4 merge problems
author | andyp |
---|---|
date | Tue, 04 Jun 2002 17:40:00 +0000 |
parents | 987c2a685f39 |
children | 79c6ff3eef26 |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 04 16:45:54 2002 +0000 +++ b/lisp/ChangeLog Tue Jun 04 17:40:00 2002 +0000 @@ -1,3 +1,7 @@ +2002-06-04 Andy Piper <andy@xemacs.org> + + * startup.el (normal-top-level): Fix bad merge. + 2002-06-04 Jerry James <james@eecs.ku.edu> * find-paths.el (paths-find-architecture-directory): Search in