• Bjoern Michaelsen's avatar
    Merge branch 'master' into feature/gnumake4 · e2682561
    Bjoern Michaelsen yazdı
    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
    e2682561
sspellimp.hxx 5.79 KB