summaryrefslogtreecommitdiff
path: root/gnu/share
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2014-03-13 02:09:35 +0000
committerBrad Smith <brad@cvs.openbsd.org>2014-03-13 02:09:35 +0000
commit6081fe63f27aa8efcea9e824b91bcb86d56376bf (patch)
tree607202386fb7fb1deb91ece61c152d340d4bafde /gnu/share
parent1342178419a992679fb622184c3449e6053d979d (diff)
merge conflicts
Diffstat (limited to 'gnu/share')
0 files changed, 0 insertions, 0 deletions