office-gobmx/desktop/source/deployment/registry
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
..
component Merge commit 'ooo/DEV300_m106' into integration/dev300_m106 2011-04-28 00:12:58 +02:00
configuration Rework how <db.h> is included 2011-05-18 11:16:16 +03:00
executable drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
help Rework how <db.h> is included 2011-05-18 11:16:16 +03:00
inc drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
package drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
script drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
sfwk drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
dp_backend.cxx Remove commented code in libs-core/desktop 2011-03-25 20:48:58 +01:00
dp_backenddb.cxx Some cppcheck cleaning 2011-04-22 15:39:25 +02:00
dp_registry.cxx drop bogus executable flag from [ch]xx/bas/asm files 2011-03-29 21:40:28 +01:00
dp_registry.src drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
makefile.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00