summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorJakob Schlyter <jakob@cvs.openbsd.org>2010-04-15 21:14:57 +0000
committerJakob Schlyter <jakob@cvs.openbsd.org>2010-04-15 21:14:57 +0000
commit61384037fa6e42ca393d6c5d5409850fa501e129 (patch)
tree5318c995cc7b7d66e1b10324345e7023493690fa /libexec
parent12e84b047121c2691fd674a590c1695108dce5ed (diff)
resolve conflicts from import of v3.2.5
Diffstat (limited to 'libexec')
0 files changed, 0 insertions, 0 deletions