1 files changed, 24 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index eb572b26b16..05bc063624b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2012-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lib/makefile.w32-in (SIG2STR_H): New macro.
+        ($(BLD)/sig2str.$(O)): Update dependencies.
+
+2012-12-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (HAVE_INOTIFY): Speed up configure-time test.
+        There's no need to test for any of three inotify functions,
+        since we use all three.  Check for just the first one.
+
+2012-12-10  Daniel Colascione  <dancol@dancol.org>
+
+        * .bzrignore: add src/emacs.res.
+
+        * configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
+        build how to compile Windows resource files; use these variables
+        to tell src/Makefile.in how and whether to compile resources.
+
+2012-12-10  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * configure.ac (inotify): New option.
+        (HAVE_INOTIFY): Test for inotify.
+
 2012-12-09  Andreas Schwab  <schwab@linux-m68k.org>
 
         * configure.ac: Fix source command in .gdbinit.