diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:45:30 +0200 |
| commit | e959581b2d44bff812ffddd34b750e4f9f29e187 (patch) | |
| tree | 257c72d3fd2bc409f391bc26892f5653241455bc /oox/prj | |
| parent | 33df62ab4a0f3c4eca1abe981c942ff53477961a (diff) | |
| parent | 256c9ce014a463b7486c8a32e7119d3f4a2c9aa4 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgwriter.cxx
lotuswordpro/source/filter/lwpchartstreamtools.cxx
lotuswordpro/source/filter/lwpfrib.cxx
lotuswordpro/source/filter/lwpgrfobj.cxx
lotuswordpro/source/filter/lwpidxmgr.cxx
lotuswordpro/source/filter/lwpobjid.cxx
lotuswordpro/source/filter/lwpparaproperty.cxx
lotuswordpro/util/makefile.mk
oox/prj/d.lst
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/makefile.mk
oox/source/drawingml/shape.cxx
oox/source/ppt/slidepersist.cxx
oox/source/token/namespaces.hxx.tail
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/makefile.mk
oox/source/xls/workbookhelper.cxx
writerfilter/source/ooxml/makefile.mk
writerfilter/source/resourcemodel/makefile.mk
Diffstat (limited to 'oox/prj')
| -rw-r--r-- | oox/prj/d.lst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/prj/d.lst b/oox/prj/d.lst index e69de29bb2d1..73cf0ba5d783 100644 --- a/oox/prj/d.lst +++ b/oox/prj/d.lst @@ -0,0 +1,3 @@ + + +..\source\token\tokens.txt %_DEST%\inc%_EXT%\oox\token\tokens.txt
\ No newline at end of file |