[Libreoffice-commits] Changes to 'integration/dev300_m106'

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 73848202876de5b01e5b2bd7e066cebe737b5f82
Merge: 8c5bd2ea4055610478bc700142fb16376d2cef15 af86d1f90d08270bf9eba043dd5497e24de17231
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:07:18 2011 +0200

    Merge branch 'DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	Module_ooo.mk
    	Repository.mk
    	configure
    	configure.in
    	ooo.lst
    	scp2/source/ooo/file_library_ooo.scp
    	scp2/source/ooo/makefile.mk
    	scp2/source/ooo/module_hidden_ooo.scp
    	solenv/config/sdev300.ini
    	solenv/config/ssolar.cmn
    	solenv/gbuild/AllLangResTarget.mk
    	solenv/gbuild/ComponentTarget.mk
    	solenv/gbuild/CppunitTest.mk
    	solenv/gbuild/Deliver.mk
    	solenv/gbuild/JavaClassSet.mk
    	solenv/gbuild/JunitTest.mk
    	solenv/gbuild/Library.mk
    	solenv/gbuild/LinkTarget.mk
    	solenv/gbuild/Module.mk
    	solenv/gbuild/Output.mk
    	solenv/gbuild/SdiTarget.mk
    	solenv/gbuild/TargetLocations.mk
    	solenv/gbuild/gbuild.mk
    	solenv/gbuild/platform/linux.mk
    	solenv/gbuild/platform/macosx.mk
    	solenv/gbuild/platform/solaris.mk
    	solenv/gbuild/platform/windows.mk
    	solenv/gbuild/platform/winmingw.mk
    	solenv/inc/minor.mk

commit af86d1f90d08270bf9eba043dd5497e24de17231
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Apr 21 23:26:09 2011 +0200

    Spaces to tabs in solenv/gbuild.