summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d56d74b20db..68c0d85b5cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-04 Paul Eggert <eggert@cs.ucla.edu>
+
+ Merge from gnulib, incorporating:
+ 2013-01-04 stdio: remove now-unnecessary stdio.c
+ 2013-01-04 fprintftime: depend on stdio, not ignore-value
+ 2013-01-04 fwrite: silence __wur only for older glibc versions
+ 2013-01-04 fwrite: silence __wur without using inline
+ * lib/stdio.c: Remove.
+ * lib/stdio.in.h, lib/strftime.c: Update from gnulib.
+ * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
2013-01-02 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating copyright-date changes and: