Merge from trunk.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69371ce..ef9e06b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -230,6 +230,10 @@
        (rst-indent-comment): Correct :version tag.
        (rst-official-cvs-rev): Correct version string.
 
+2012-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * subr.el (w32notify-handle-event): New function.
+
 2012-10-07  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmailmm.el (rmail-mime-process-multipart):