strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/oovbaapi
History
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
..
genconstidl Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00
ooo/vba Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:46:20 +02:00
prj drop bogus executable flag from idl/build/src and config files 2011-03-29 21:47:37 +01:00
util Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 02:42:58 +01:00