summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-03-25 21:16:13 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-03-25 21:16:13 -0700
commitcefcfbcc1b7865dafd615c0fe42e62dbe2660ddd (patch)
tree9e0b51810e1fd2ce97f50a3af8540ecc0f47597c /ChangeLog
parentb18d7820f32694a5f386f2a334b81c2fcd9edf0a (diff)
downloademacs-cefcfbcc1b7865dafd615c0fe42e62dbe2660ddd.tar.gz
Merge from gnulib.
This incorporates: 2014-03-26 strftime: wrap macros in "do {...} while(0)" * lib/strftime.c, doc/misc/texinfo.tex: Update from gnulib.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e98bdf317..04f5bed7ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-26 Paul Eggert <eggert@cs.ucla.edu>
+
+ Merge from gnulib, incorporating:
+ 2014-03-26 strftime: wrap macros in "do {...} while(0)"
+ * lib/strftime.c: Update from gnulib.
+
2014-03-07 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating: