Merge from emacs--rel--22

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6fc359f..68c150a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+       * trouble.texi (Quitting): Fix typo.
+
 2007-10-18  Glenn Morris  <rgm@gnu.org>
 
        * frames.texi (Mode Line Mouse): Mention minor mode names.