summaryrefslogtreecommitdiffstats
path: root/sd/uiconfig
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-06-17 09:00:57 +0200
committerobo <obo@openoffice.org>2010-06-17 09:00:57 +0200
commit8c75156a84a5088506c49101efad199dc7b8d05e (patch)
treeda1aa4b0253a6ba07ba82fb5b359798e58cb5cb7 /sd/uiconfig
parentmasterfix: #i10000# remove conflict marks (diff)
downloadcore-8c75156a84a5088506c49101efad199dc7b8d05e.tar.gz
core-8c75156a84a5088506c49101efad199dc7b8d05e.zip
masterfix: #i10000# resolve merge problems
Diffstat (limited to 'sd/uiconfig')
0 files changed, 0 insertions, 0 deletions