From: Kenichi Handa <handa@m17n.org>
Date: Wed, 27 Sep 2000 00:02:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~1359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=672172d9b804fd0935153007050f251e81cdf651;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60d457b21a6..58d10200e9f 100644
--- 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.