Merge from gnulib for 'inline', incorporating:

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a351872..92c11ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-12-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib for 'inline' (Bug#13040), incorporating:
+       2012-12-11 extern-inline: avoid incompatibility with Darwin Libc
+       * m4/extern-inline.m4: Update from gnulib.
+
+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.
@@ -6,6 +17,8 @@
 
 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.