strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/oox/source/vml
History
Jan Holesovsky e959581b2d 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
2011-05-27 20:45:30 +02:00
..
vmldrawing.cxx WaE (picky) - noeol 2011-05-16 22:22:59 +02:00
vmldrawingfragment.cxx Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-27 01:31:35 +02:00
vmlformatting.cxx Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-27 01:31:35 +02:00
vmlinputstream.cxx WaE (picky) - noeol 2011-05-16 22:22:59 +02:00
vmlshape.cxx Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-27 01:31:35 +02:00
vmlshapecontainer.cxx WaE (picky) - noeol 2011-05-16 22:22:59 +02:00
vmlshapecontext.cxx fix mis-merge in oox 2011-03-13 05:36:33 -05:00
vmltextbox.cxx WaE (picky) - noeol 2011-05-16 22:22:59 +02:00
vmltextboxcontext.cxx Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-27 01:31:35 +02:00