summaryrefslogtreecommitdiff
path: root/libopie2
authorwaspe <waspe>2003-11-04 16:59:55 (UTC)
committer waspe <waspe>2003-11-04 16:59:55 (UTC)
commit5865ec3970cead5b2cf3dd255a55cf2e1869e330 (patch) (unidiff)
tree657cab0ca04a93565ee16e79f0aedda63d1923d0 /libopie2
parentda5c9b06fe0081050ab8165cf3d189dbc8117bf6 (diff)
downloadopie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.zip
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.gz
opie-5865ec3970cead5b2cf3dd255a55cf2e1869e330.tar.bz2
resloved merge conflict
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions