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


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