diff options
| author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
|---|---|---|
| committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-07-08 12:27:24 +0200 |
| commit | 436416a6320037855846fce127a0cfa77ac45270 (patch) | |
| tree | 2a6326eecb06a6996d68580df4b8260515c46b4c /sd/source/ui/dlg/TemplateScanner.cxx | |
| parent | df76bfb0695d19d201936df80192108e7ce51b8c (diff) | |
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/source/ui/dlg/TemplateScanner.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/dlg/TemplateScanner.cxx | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 9f510f20c55d..9f510f20c55d 100644..100755 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx |