diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:28:36 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:28:36 +0100 |
commit | 3ae6837ccd2d6bca0ddf2e0de15c9f2d7c790316 (patch) | |
tree | 6367d8dfbf943afb129477191a6256aacda7f3f4 /sw/source/ui/uno/swdetect.cxx | |
parent | 08def50728729806b30b1fb5376cdc4f82388520 (diff) |
#i10000# resolve conflict
Diffstat (limited to 'sw/source/ui/uno/swdetect.cxx')
0 files changed, 0 insertions, 0 deletions