summaryrefslogtreecommitdiff
path: root/lib/libXfont
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-31 15:32:14 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-12-31 15:32:14 +0000
commit54aa43e2a53a1aae1ccce74ccef55c1c6dcf0691 (patch)
tree1e640e7732f26150b7e2a60f22987ab20400c83d /lib/libXfont
parent094574aa444db745c1f0e0f2b31952d44352c721 (diff)
resolve conflicts
Diffstat (limited to 'lib/libXfont')
0 files changed, 0 insertions, 0 deletions