Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7a9a6bc818cf51ff2893c2620308f12d33139f30..c753ab5a1a24ab51a32dee21fe8e127e2fa886f8 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * frames.texi (Mouse Commands): Fix the description of mouse-2.
+       (Bug#11958)
+
 2012-07-19  Chong Yidong  <cyd@gnu.org>
 
        * emacs.texi: Update ISBN.