| commit | 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Wed, 28 Jan 2015 06:24:19 +0000 (27 22:24 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Wed, 28 Jan 2015 06:24:47 +0000 (27 22:24 -0800) | ||
| tree | e3331217ed3d9fab50de7d92fa1f2074138ac407 | treesnapshot (tar.gz zip) |
| parent | 0cdd599c54aeda36e7e0696b2f90d2c286153a1d | commitdiff |
Merge from gnulib and try to repair bad merge
This attempts to repair problems introduced by the bad merge
5491fd1098d27b3ba3db054076b9ab60fb3558dc. 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
This attempts to repair problems introduced by the bad merge
5491fd1098d27b3ba3db054076b9ab60fb3558dc. 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
79 files changed: