]> git.cworth.org Git - tar/commitdiff
projects / tar / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5a7e35 22f1eb8)
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)
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


Trivial merge
Unnamed repository; edit this file to name it for gitweb.