Merge from trunk.

[gnu-emacs] / lib-src / ChangeLog

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bcb71daca5da037e0878c7913a5ee0c4b4e99638..8120ab7f18d4e5869770a83b785575ed399d86fb 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -39,6 +39,10 @@
        (main): Retry connection with alt_display if connection with main
        display fails.
 
+2012-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (obj): Add w32notify.o.
+
 2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
 
        * make-docfile.c (write_globals): Special-case