aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2002-02-17 18:17:51 +0000
committerPavel Janík2002-02-17 18:17:51 +0000
commitc484a3a28074c4564e342440f148a7abafc37ba3 (patch)
tree6388832b6617723187fb42dd17fa7bac176a5dbd
parent5a776940c3643f1765793eb65468d1f69f0c4bfb (diff)
downloademacs-c484a3a28074c4564e342440f148a7abafc37ba3.tar.gz
emacs-c484a3a28074c4564e342440f148a7abafc37ba3.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fed1e178e32..14f99c756fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -127,7 +127,6 @@
127 * eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace 127 * eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace
128 after the #! of a shell interpretor specification. 128 after the #! of a shell interpretor specification.
129 129
130>>>>>>> 1.3466
1312002-02-15 Richard M. Stallman <rms@gnu.org> 1302002-02-15 Richard M. Stallman <rms@gnu.org>
132 131
133 * help.el (describe-key-briefly): Make output in INSERT case 132 * help.el (describe-key-briefly): Make output in INSERT case