office-gobmx/lingucomponent/source
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
..
hyphenator/altlinuxhyph/hyphen Merge branch 'master' into feature/gnumake4 2011-06-19 12:54:22 +02:00
languageguessing inefficient emptiness check 2011-04-26 15:25:15 +01:00
lingutil remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (components) 2011-04-19 21:04:35 +02:00
spellcheck Merge branch 'master' into feature/gnumake4 2011-06-19 12:54:22 +02:00
thesaurus/libnth Merge branch 'master' into feature/gnumake4 2011-06-19 12:54:22 +02:00