strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/hwpfilter
History
Jan Holesovsky 62abc84216 Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	binfilter/bf_forms/source/component/forms_Filter.cxx
	binfilter/bf_sw/source/core/inc/node2lay.hxx
	binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
	binfilter/inc/bf_sw/swdbtoolsclient.hxx
	filter/source/xsltdialog/xmlfileview.cxx
	oox/source/ole/axcontrol.cxx
	oox/source/vml/vmlformatting.cxx
	oox/source/xls/autofiltercontext.cxx
	oox/source/xls/externallinkfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/pivotcachefragment.cxx
	oox/source/xls/sheetdatacontext.cxx
	writerfilter/source/dmapper/GraphicImport.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/ooxml/model.xml
2011-03-18 15:38:26 +01:00
..
inc add modelines to .hxx files as well 2010-10-28 15:49:40 +01:00
prj sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt 2010-10-22 10:37:46 +02:00
source Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:38:26 +01:00