diff options
author | Andre Fischer <af@openoffice.org> | 2009-10-16 13:24:22 +0000 |
---|---|---|
committer | Andre Fischer <af@openoffice.org> | 2009-10-16 13:24:22 +0000 |
commit | 83168b2ff90cf04ee9f5b5f6408d184f2709f26e (patch) | |
tree | b64c54481ddab5be54a6e648c5f2b593c29663c3 /slideshow/source/inc | |
parent | 7168fa353e1e7aab66e5f232a1f7015e725a263c (diff) |
#i48179# Resolved merge problems.
Diffstat (limited to 'slideshow/source/inc')
0 files changed, 0 insertions, 0 deletions