Commit graph

12 commits

Author SHA1 Message Date
Takeshi Abe
b2bd33ea25 prefer makefile-gmake-mode to plain makefile-mode 2011-08-10 02:12:48 +09:00
Tor Lillqvist
b9bee88e1b Add consistent Emacs and vim mode lines 2011-07-30 23:01:51 +03:00
Bjoern Michaelsen
6f38368f3b keep gbuild calls consistent at now, even if it is a bit longer 2011-07-23 15:23:21 +02:00
Bjoern Michaelsen
e0b4860fb1 postmerge fixes for gnumake4 2011-07-22 21:22:43 +02:00
Bjoern Michaelsen
112be98c92 resyncing to master 2011-07-21 18:38:50 +02:00
Bjoern Michaelsen
ae2ebf8fac Merge branch 'master' into feature/gnumake4
Conflicts:
	filter/source/config/cache/filtercache.cxx
	filter/source/odfflatxml/makefile.mk
	oox/Library_oox.mk
	oox/Makefile
	oox/Module_oox.mk
	oox/Package_generated.mk
	oox/Package_inc.mk
	oox/prj/build.lst
	oox/prj/d.lst
	oox/prj/makefile.mk
	oox/source/dump/makefile.mk
	unoxml/Library_unordf.mk
	unoxml/Library_unoxml.mk
	writerfilter/CppunitTest_writerfilter_doctok.mk
	writerfilter/Library_writerfilter.mk
	writerfilter/Module_writerfilter.mk
	writerfilter/Package_inc.mk
	writerfilter/inc/resourcemodel/TagLogger.hxx
	writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
	writerfilter/prj/build.lst
	writerfilter/prj/makefile.mk
	writerfilter/qa/complex/ooxml/makefile.mk
	writerfilter/qa/cppunittests/doctok/makefile.mk
	writerfilter/qa/cppunittests/doctok/testdoctok.cxx
	writerfilter/qa/cppunittests/xxml/testXXML.cxx
	writerfilter/source/dmapper/DomainMapper.cxx
	writerfilter/source/dmapper/DomainMapperTableHandler.cxx
	writerfilter/source/dmapper/DomainMapperTableManager.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/FontTable.cxx
	writerfilter/source/dmapper/GraphicHelpers.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyMap.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/dmapper/StyleSheetTable.cxx
	writerfilter/source/dmapper/TablePropertiesHandler.cxx
	writerfilter/source/dmapper/TblStylePrHandler.cxx
	writerfilter/source/dmapper/ThemeTable.cxx
	writerfilter/source/doctok/WW8DocumentImpl.cxx
	writerfilter/source/doctok/resourcesimpl.xsl
	writerfilter/source/filter/WriterFilter.cxx
	writerfilter/source/generated.mk
	writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
	writerfilter/source/ooxml/OOXMLFactory.cxx
	writerfilter/source/ooxml/OOXMLFactory.hxx
	writerfilter/source/ooxml/OOXMLStreamImpl.cxx
	writerfilter/source/ooxml/RefAndPointer.hxx
	writerfilter/source/resourcemodel/TagLogger.cxx
	writerfilter/unocomponent/component.cxx
	writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
	writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
2011-06-19 20:09:46 +02:00
Hans-Joachim Lankenau
4d427bd5c8 ause130: #i117218# missing pieces... 2011-06-18 11:26:56 +02:00
Michael Stahl
ec93d094ca gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd] 2011-06-17 14:24:10 +02:00
Michael Stahl
126d913899 gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7] 2011-06-17 09:55:38 +02:00
Jan Holesovsky
90087ebb40 Merge commit 'ooo/DEV300_m103'
Conflicts:
	binfilter/bf_xmloff/source/forms/formcellbinding.hxx
	binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
	binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
	filter/source/xsltfilter/makefile.mk
	unoxml/source/dom/characterdata.cxx
	unoxml/source/dom/document.cxx
	unoxml/source/dom/documentbuilder.cxx
	unoxml/source/dom/element.cxx
	unoxml/source/dom/elementlist.cxx
	unoxml/source/dom/node.cxx
	unoxml/source/dom/node.hxx
	unoxml/source/dom/text.cxx
	unoxml/source/events/event.cxx
	unoxml/source/events/event.hxx
	unoxml/source/events/eventdispatcher.cxx
	unoxml/source/events/eventdispatcher.hxx
	unoxml/source/events/mouseevent.cxx
	unoxml/source/events/mouseevent.hxx
	unoxml/source/events/mutationevent.cxx
	unoxml/source/events/mutationevent.hxx
	unoxml/source/events/uievent.cxx
	unoxml/source/events/uievent.hxx
	unoxml/source/xpath/nodelist.cxx
	unoxml/source/xpath/nodelist.hxx
	unoxml/source/xpath/xpathobject.cxx
2011-03-23 16:59:02 +01:00
Michael Stahl
2029cf2e42 xmlfix3: fix unoxml build: add windows stuff to RepositoryFixes, add gb_STDLIBS 2011-02-14 14:19:23 +01:00
Michael Stahl
d3df5839b9 xmlfix3: convert unoxml to gbuild 2011-02-10 18:37:54 +01:00