Jan Holesovsky 5f08d6e5a4 Merge commit 'ooo/DEV300_m103' ...

Conflicts:
	configure
	configure.in
	instsetoo_native/util/openoffice.lst
	set_soenv.in
	solenv/bin/cws.pl
	solenv/bin/modules/installer/simplepackage.pm
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/extensions/post_PackModule.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/installationtest.mk
	solenv/inc/minor.mk
	soltools/cpp/_eval.c

2011-03-23 16:58:44 +01:00

..

adjustvisibility

adjust indent

2011-01-07 11:07:24 +00:00

checkdll

Porting LO to Dragonfly

2011-02-10 10:38:31 +01:00

cpp

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:58:44 +01:00

giparser

Removed some commented code.

2011-02-18 10:30:50 +01:00

inc

Silence compiler warnings

2011-02-03 00:44:33 +02:00

javadep

Silence a couple of compiler warnings

2011-02-03 00:44:29 +02:00

ldump

Removed some commented code.

2011-02-18 10:30:50 +01:00

mkdepend

Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101

2011-03-08 22:31:15 -06:00

prj

CWS changehid: no hid.lst generation anymore

2010-10-21 14:22:09 +02:00

support

Silence a couple of compiler warnings

2011-02-03 00:44:27 +02:00

testhxx

Add vim/emacs modelines to all source files

2010-10-13 10:57:13 +02:00

testSHL

Removed some commented code.

2011-02-18 10:30:50 +01:00

util

Trying to remove the stlport mention from the code

2011-02-09 20:18:11 +01:00

winunistd

add modelines to .h files as well

2010-10-28 15:47:03 +01:00