diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-15 00:20:57 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-15 00:20:57 +0100 |
commit | 5390c9fba7b59dda8f1a2a00e9535a52098d04e0 (patch) | |
tree | 4d14b6a42498322b5ef85d530dc93c2320d04626 /sw/source/ui/uiview/viewprt.cxx | |
parent | b59c89d2ae495e0c42ae76042379960444269b19 (diff) |
solve some merge problems
Diffstat (limited to 'sw/source/ui/uiview/viewprt.cxx')
0 files changed, 0 insertions, 0 deletions