1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 30a431363cc..b4f74aea850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
+
 2012-09-19  Tassilo Horn  <tsdh@gnu.org>
 
         * doc/emacs/misc.texi (DocView Slicing): Document new slice from