diff options
| author | Ruediger Timm <rt@openoffice.org> | 2010-06-24 10:49:45 +0200 |
|---|---|---|
| committer | Ruediger Timm <rt@openoffice.org> | 2010-06-24 10:49:45 +0200 |
| commit | 5c62576e5d8af7379a57b45392d3c51c0bcd0fcc (patch) | |
| tree | 23d3de58eb542217cbcfacda5b74071f7a39f2b0 /oox/source/ppt/pptshapecontext.cxx | |
| parent | 0943ff4d05973fb7a227e680a10c89745d15f9cd (diff) | |
masterfix: #i10000# Merge error corrected.
Notes
split repo tag: writer_ooo/DEV300_m84
split repo tag: writer_ooo/OOO330_m0
Diffstat (limited to 'oox/source/ppt/pptshapecontext.cxx')
0 files changed, 0 insertions, 0 deletions