1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 16afbdd3c99..4f339482a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-08-20 extern-inline: support old GCC 'inline'
+
 2012-08-20  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac (AC_PROG_LN_S): Test for ln.