diff options
| author | Miles Bader | 2000-10-07 02:38:22 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-10-07 02:38:22 +0000 |
| commit | 56cc166567530679ca611a3b76dd6a33e1d90f11 (patch) | |
| tree | 71e2fc4fe297d162e65bfd2d35b8875a0f70ef3a | |
| parent | f5533b63587a3acce7079ab313d88de124e7cb7b (diff) | |
| download | emacs-56cc166567530679ca611a3b76dd6a33e1d90f11.tar.gz emacs-56cc166567530679ca611a3b76dd6a33e1d90f11.zip | |
Fix merge screwup.
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85acae57ef7..5ef7457d88b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -49,11 +49,6 @@ | |||
| 49 | latter needs the autoloaded define-minor-mode macro during the | 49 | latter needs the autoloaded define-minor-mode macro during the |
| 50 | bootstrap. | 50 | bootstrap. |
| 51 | 51 | ||
| 52 | 2000-10-06 Miles Bader <miles@lsi.nec.co.jp> | ||
| 53 | |||
| 54 | * simple.el (shell-command-on-region): If the output is short | ||
| 55 | enough to display in an expanded echo area, show it here. | ||
| 56 | |||
| 57 | * startup.el (command-line): For now, activate tool-bar-mode only | 52 | * startup.el (command-line): For now, activate tool-bar-mode only |
| 58 | if XPM images are supported. | 53 | if XPM images are supported. |
| 59 | 54 | ||