Jan Holesovsky a3a19632f4 Merge remote-tracking branch 'origin/integration/dev300_m101' ...

Conflicts:
	bridges/source/remote/urp/urp_environment.cxx
	bridges/source/remote/urp/urp_propertyobject.cxx
	bridges/source/remote/urp/urp_reader.cxx
	remotebridges/source/factory/bridgefactory.cxx
	stoc/source/corereflection/crefl.cxx
	stoc/source/javavm/javavm.cxx
	stoc/source/simpleregistry/simpleregistry.cxx

2011-03-18 15:58:02 +01:00

..

AffineBridge

Add vim/emacs modelines to all source files

2010-10-14 17:04:31 +02:00

cppu

Add vim/emacs modelines to all source files

2010-10-14 17:04:31 +02:00

helper/purpenv

Replace all occured, occurance etc.

2010-12-06 09:16:29 +00:00

LogBridge

move module cppu to boost unordered containers

2011-02-03 23:39:38 +01:00

threadpool

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:58:02 +01:00

typelib

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:58:02 +01:00

uno

Merge remote-tracking branch 'origin/integration/dev300_m101'

2011-03-18 15:58:02 +01:00

UnsafeBridge

Add vim/emacs modelines to all source files

2010-10-14 17:04:31 +02:00