Merge from gnulib.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 57f1bec65ac889785742d4f3776b6bd4b013eb9a..b4f74aea85077aace3b58057cb50208b2fa08a68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
+       BoundingBox feature.
+
 2012-09-18  Jan Djärv  <jan.h.d@swipnet.se>
 
        * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.