summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-09-22 02:46:20 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-09-22 02:46:20 -0700
commite41c05e55d9c59c8ead2aa5cf96d8a97ff5826f9 (patch)
tree7a9b5fcf0d50b0c20151f4c4274e8077f1204c57 /ChangeLog
parent48a24920cca0a0d4b69bb71cb680b55c55671527 (diff)
downloademacs-e41c05e55d9c59c8ead2aa5cf96d8a97ff5826f9.tar.gz
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
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