1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 051819daf29..c29a9856a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-08-05 extern-inline: also ignore -Wmissing-declarations
+
 2012-08-10  Juanma Barranquero  <lekktu@gmail.com>
 
         * lib/makefile.w32-in (STAT_TIME_H): New macro.