office-gobmx/package
Jan Holesovsky 88c1a56d11 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	extensions/source/svg/svgaction.cxx
	extensions/source/svg/svguno.cxx
	package/source/xstor/owriteablestream.cxx
	package/source/xstor/xstorage.cxx
	package/source/zippackage/ZipPackageStream.cxx
	setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
2011-05-27 20:39:30 +02:00
..
dtd changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
inc Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
prj Deliver the right thing so that Windows builds again 2011-03-30 15:02:48 +02:00
qa mav60: adjust the complex tests 2011-03-25 12:11:27 +01:00
source Merge remote-tracking branch 'origin/integration/dev300_m106' 2011-05-27 20:39:30 +02:00
util Deliver the right thing so that Windows builds again 2011-03-30 15:02:48 +02:00