*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60d457b21a6ef5ed462cfce0168e85fb257550ca..58d10200e9ff2cb3e58a6c1b6e3a91621f9fae40 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-22  Kenichi Handa  <handa@etl.go.jp>
+
+       * international/quail.el (quail-help): The output message is
+       improved.
+
 2000-09-26  Dave Love  <fx@gnu.org>
 
        * mouse.el (popup-menu): If POSITION is nil, set it using
@@ -51,6 +56,7 @@
        * startup.el (command-line-1, fancy-splash-text): Change the
        text to sound more friendly.
 
+>>>>>>> 1.1138
 2000-09-23  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * progmodes/hideshow.el: Update author email address.