office-gobmx/readlicense_oo
Jan Holesovsky 9df8682ced Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	basic/source/classes/sbunoobj.cxx
	basic/source/inc/runtime.hxx
	basic/source/runtime/step1.cxx
	desktop/source/deployment/dp_services.cxx
	drawinglayer/prj/d.lst
	drawinglayer/source/primitive2d/makefile.mk
	sfx2/source/appl/appinit.cxx
	sfx2/source/appl/appquit.cxx
	sfx2/source/inc/appdata.hxx
	sfx2/source/view/viewfrm.cxx
	svx/source/fmcomp/gridctrl.cxx
	vbahelper/source/vbahelper/vbahelper.cxx
2011-05-27 20:46:20 +02:00
..
docs Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-28 00:12:58 +02:00
html fdo#37001 - updated license information 2011-05-24 12:05:59 +02:00
odt fdo#37001 - updated license information 2011-05-24 12:05:59 +02:00
prj drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
txt fdo#37001 - updated license information 2011-05-24 12:05:59 +02:00
util l10n: 'fold' from coreutils does not work well for some languages 2011-02-23 22:31:04 +01:00
makefile.mk