Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 865:987c2a685f39 | 866:613552a02607 |
|---|---|
| 1 2002-06-04 Andy Piper <andy@xemacs.org> | |
| 2 | |
| 3 * startup.el (normal-top-level): Fix bad merge. | |
| 4 | |
| 1 2002-06-04 Jerry James <james@eecs.ku.edu> | 5 2002-06-04 Jerry James <james@eecs.ku.edu> |
| 2 | 6 |
| 3 * find-paths.el (paths-find-architecture-directory): Search in | 7 * find-paths.el (paths-find-architecture-directory): Search in |
| 4 `system-configuration'/`base', not `base'`system-configuration'. | 8 `system-configuration'/`base', not `base'`system-configuration'. |
| 5 | 9 |
