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
..
CAs
certs	Merge remote-tracking branch 'origin/integration/dev300_m106'	2011-05-27 20:39:30 +02:00
documents	drop bogus executable flag from odf files	2011-03-29 21:43:57 +01:00
tools
test_description.odt