strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/slideshow
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
..
inc add modelines to .hxx files as well 2010-10-28 15:50:10 +01:00
prj Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 2011-03-12 20:06:58 +01:00
qa Remove RCS lines. 2011-01-31 19:01:32 +01:00
source Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:40:35 +01:00
test Merge remote-tracking branch 'origin/integration/dev300_m101' 2011-03-18 15:40:35 +01:00
util impressdefaults1: #i113019# fixes to make changing of user paint settings during slideshow work 2010-12-02 13:34:17 +01:00
manifest.txt INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED 2007-07-17 13:32:44 +00:00