]> git.cworth.org Git - tar/commit - m4/gnulib-comp.m4
Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Mon, 1 Nov 2010 23:22:36 +0000 (17:22 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 1 Nov 2010 23:22:36 +0000 (17:22 -0600)
commitb414e25de8ca49d7567a92c203d431383ec57c83
tree428b07610875b8c8d63dc4a0212251354e455ca1
parent29ece34f44a27750bbfd76154ad9882580453dc7
parentee168310ec4227174ace489bf5f81f8c2f91cde0
Merge branch 'upstream' into dfsg-orig

Conflicts:
doc/Makefile.am
doc/Makefile.in
doc/dumpdir.texi
doc/fdl.texi
doc/gendocs_template
doc/intern.texi
doc/mastermenu.el
doc/parse-datetime.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/value.texi
doc/version.texi