aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2014-07-12 13:02:44 -0700
committerPaul Eggert2014-07-12 13:02:44 -0700
commitd105c56ff95893f00e37a20bfd09f155fb87a5b4 (patch)
treebcaded9914203580bf501b340230718f6998932e /ChangeLog
parentb39c4d7b33952e0125fbefbcb3d9f528b6570f40 (diff)
downloademacs-d105c56ff95893f00e37a20bfd09f155fb87a5b4.tar.gz
emacs-d105c56ff95893f00e37a20bfd09f155fb87a5b4.zip
Merge from gnulib, incorporating:
2014-06-27 mktime: merge #if/#ifdef usage from glibc * lib/mktime.c: Update from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e6822737f1..f8852211e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
12014-07-12 Paul Eggert <eggert@cs.ucla.edu> 12014-07-12 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Merge from gnulib, incorporating:
4 2014-06-27 mktime: merge #if/#ifdef usage from glibc
5 * lib/mktime.c: Update from gnulib.
6
3 * Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971). 7 * Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971).
4 8
52014-07-10 Dmitry Antipov <dmantipov@yandex.ru> 92014-07-10 Dmitry Antipov <dmantipov@yandex.ru>