office-gobmx/lingucomponent
Bjoern Michaelsen e268256133 Merge branch 'master' into feature/gnumake4
Conflicts:
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	setup_native/prj/build.lst
	setup_native/prj/d.lst
	wizards/Jar_query.mk
	wizards/Module_wizards.mk
	wizards/Zip_launcher.mk
	wizards/com/sun/star/wizards/report/makefile.mk
	wizards/prj/build.lst
	wizards/prj/d.lst
	wizards/util/target.pmk
2011-06-19 12:54:22 +02:00
..
config
inc add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
prj Drop %_EXT% which was always empty 2011-06-03 13:25:56 +03:00
source Merge branch 'master' into feature/gnumake4 2011-06-19 12:54:22 +02:00