summaryrefslogtreecommitdiff
path: root/bin/pax
diff options
context:
space:
mode:
authorJakob Schlyter <jakob@cvs.openbsd.org>2006-04-05 17:34:37 +0000
committerJakob Schlyter <jakob@cvs.openbsd.org>2006-04-05 17:34:37 +0000
commita5660519092c14a038dc3a5decd26432fde3f0c6 (patch)
tree92dac6ca16d4a18abb36e2c601fad2ca8673aa7b /bin/pax
parent60ec39e46f82765bb91db7c4eb62d829ccde85d4 (diff)
resolve conflicts
Diffstat (limited to 'bin/pax')
0 files changed, 0 insertions, 0 deletions