diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
| commit | 606a57481911e111dfab950cd7fb90ae80aed014 (patch) | |
| tree | 62e85311b32105e6d4e165d60c9d4bbdb80c03bc /embeddedobj/source/commonembedding | |
| parent | a4d7dbf897e41a1afda6c2b6f0e5cc35920a1cf3 (diff) | |
| parent | ed49568618442960781b63c3a47ddc65031b2fa0 (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
also removed some old headers ( which I need to add new ones for )
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
xmloff/inc/xmlnmspe.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Diffstat (limited to 'embeddedobj/source/commonembedding')
0 files changed, 0 insertions, 0 deletions