11 commits

Author	SHA1	Message	Date
Paul Eggert	39c2fa3f4e	Merge from gnulib and try to repair bad merge ... This attempts to repair problems introduced by the bad merge 5491fd1098. The easiest way for me to fix the badly-merged gnulib files was to run 'admin/merge-gnulib', so I did that, which also imported the following changes: * build-aux/update-copyright, m4/gnulib.m4: Update from gnulib, incorporating: 2015-01-15 time: port to MinGW32 3.21 2015-01-15 update-copyright: apply to self 2015-01-11 update-copyright: recognize groff's \(co marker	2015-01-27 22:24:47 -08:00
Paul Eggert	732fd4c7e1	Update copyright year to 2015 ... Run admin/update-copyright.	2015-01-01 09:18:06 -08:00
Paul Eggert	cefcfbcc1b	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.	2014-03-25 21:16:13 -07:00
Paul Eggert	ba3189039a	Update copyright year to 2014 by running admin/update-copyright.	2014-01-01 07:43:34 +00:00
Paul Eggert	454fa9b7ea	Spelling fix merged from gnulib.	2013-01-09 00:25:11 -08:00
Paul Eggert	ca6a2684bd	Merge from gnulib (comment change only).	2013-01-07 21:07:19 -08:00
Paul Eggert	ee0d39381a	Merge from gnulib. ... This incorporates: 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-03 18:17:49 -08:00
Paul Eggert	ab422c4d68	Update copyright notices for 2013.	2013-01-01 09:11:05 +00:00
Paul Eggert	caf8a9b2b3	Merge from gnulib. ... Fixes: debbugs:11527	2012-05-26 16:14:36 -07:00
Paul Eggert	a44c5709ce	Merge from gnulib.	2011-03-21 09:26:05 -07:00
Paul Eggert	16c3e636a6	strftime: import from gnulib	2011-01-30 15:34:18 -08:00