aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2013-08-11 17:52:17 -0700
committerPaul Eggert2013-08-11 17:52:17 -0700
commiteaca0446e72c1a62e259c0ee0eabdd6a0443e5c8 (patch)
tree5d0d07c792c47fc34bd9086a689f460fd45b741d /ChangeLog
parent808190e694c48dd9bf851baf114c095f39794c37 (diff)
downloademacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.tar.gz
emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.zip
Merge from gnulib.
This incorporates: 2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h 2013-08-10 sys_time: port to OpenBSD
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 917dd91e1ab..1feddc0a8e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12013-08-12 Paul Eggert <eggert@cs.ucla.edu>
2
3 Merge from gnulib, incorporating:
4 2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
5 2013-08-10 sys_time: port to OpenBSD
6
12013-08-12 Glenn Morris <rgm@gnu.org> 72013-08-12 Glenn Morris <rgm@gnu.org>
2 8
3 * configure.ac (etcdocdir): Rename from docdir, to avoid confusion 9 * configure.ac (etcdocdir): Rename from docdir, to avoid confusion