strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/animations/source/animcore
History
Jan Holesovsky a0c13ffcce Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	sd/source/ui/func/fuinsfil.cxx
	sd/source/ui/func/fuprobjs.cxx
	sd/source/ui/slideshow/slideshowimpl.cxx
	sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/view/drawview.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/outlview.cxx
2011-03-18 15:40:35 +01:00
..
animcore.component sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
animcore.cxx Removed unused codes and fix some typos 2011-01-25 07:22:21 +01:00
animcore.xml remove vos reference from uno xml descriptions 2010-10-27 01:08:01 -05:00
factreg.cxx Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
factreg.hxx add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
makefile.mk Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
targetpropertiescreator.cxx Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:40:35 +01:00