diff options
author | obo <obo@openoffice.org> | 2010-06-17 09:00:57 +0200 |
---|---|---|
committer | obo <obo@openoffice.org> | 2010-06-17 09:00:57 +0200 |
commit | 8c75156a84a5088506c49101efad199dc7b8d05e (patch) | |
tree | da1aa4b0253a6ba07ba82fb5b359798e58cb5cb7 /sd/uiconfig | |
parent | masterfix: #i10000# remove conflict marks (diff) | |
download | core-8c75156a84a5088506c49101efad199dc7b8d05e.tar.gz core-8c75156a84a5088506c49101efad199dc7b8d05e.zip |
masterfix: #i10000# resolve merge problems
Diffstat (limited to 'sd/uiconfig')
0 files changed, 0 insertions, 0 deletions