]> git.cworth.org Git - tar/commit - m4/dos.m4
Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 16:34:07 +0000 (09:34 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 16:34:07 +0000 (09:34 -0700)
commit29ece34f44a27750bbfd76154ad9882580453dc7
tree5630068ddd1b9c5280aff998bbce19f006929080
parentd5a7e356d395fe65871629bb9f7ddc17e1bebada
parent22f1eb8bc17e5be72dd23d42d6aaa60196ac22e6
Merge branch 'upstream' into dfsg-orig

Conflicts:
doc/Makefile.am
doc/Makefile.in
doc/genfile.texi
doc/getdate.texi
doc/snapshot.texi
doc/sparse.texi
doc/stamp-vti
doc/tar-snapshot-edit.texi
doc/tar.info
doc/tar.info-1
doc/tar.info-2
doc/tar.texi
doc/version.texi