summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-05-17 12:37:12 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-05-17 12:37:12 +0200
commit2bd59de0da26665eaa2469180988a66b7648191a (patch)
treeabe837f807632c65b3c8fbce66166bce76666ccd /ucb
parent3a3aa531e712b5bc53623a4eb43b8d932e88f8a9 (diff)
#i10000# fixed bad merge
Diffstat (limited to 'ucb')
0 files changed, 0 insertions, 0 deletions