2554b31146
Conflicts: extensions/source/svg/svgaction.cxx extensions/source/svg/svgaction.hxx extensions/source/svg/svgcom.hxx extensions/source/svg/svgprinter.cxx extensions/source/svg/svgprinter.hxx extensions/source/svg/svguno.cxx extensions/source/svg/svgwriter.cxx extensions/source/svg/svgwriter.hxx javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/InstallationOngoingCtrl.java javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java package/inc/ZipFile.hxx package/inc/ZipOutputStream.hxx package/inc/ZipPackage.hxx package/inc/ZipPackageStream.hxx package/source/manifest/ManifestExport.cxx package/source/manifest/ManifestImport.cxx package/source/manifest/UnoRegister.cxx package/source/xstor/owriteablestream.cxx package/source/xstor/xstorage.cxx package/source/xstor/xstorage.hxx package/source/zipapi/EntryInputStream.cxx package/source/zipapi/EntryInputStream.hxx package/source/zipapi/XFileStream.cxx package/source/zipapi/XFileStream.hxx package/source/zipapi/XMemoryStream.cxx package/source/zipapi/XUnbufferedStream.cxx package/source/zipapi/XUnbufferedStream.hxx package/source/zipapi/ZipFile.cxx package/source/zipapi/ZipOutputStream.cxx package/source/zipapi/sha1context.hxx package/source/zippackage/ZipPackage.cxx package/source/zippackage/ZipPackageFolder.cxx package/source/zippackage/ZipPackageStream.cxx setup_native/source/win32/customactions/shellextensions/registerextensions.cxx wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java xmlsecurity/prj/build.lst xmlsecurity/source/helper/xmlsignaturehelper.cxx xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx |
||
|---|---|---|
| .. | ||
| certerrors.h | ||
| ciphercontext.cxx | ||
| ciphercontext.hxx | ||
| digestcontext.cxx | ||
| digestcontext.hxx | ||
| makefile.mk | ||
| nssinitializer.cxx | ||
| nssinitializer.hxx | ||
| nssrenam.h | ||
| sanextension_nssimpl.cxx | ||
| sanextension_nssimpl.hxx | ||
| secerror.cxx | ||
| secerror.hxx | ||
| securityenvironment_nssimpl.cxx | ||
| securityenvironment_nssimpl.hxx | ||
| seinitializer_nssimpl.cxx | ||
| seinitializer_nssimpl.hxx | ||
| x509certificate_nssimpl.cxx | ||
| x509certificate_nssimpl.hxx | ||
| xmlencryption_nssimpl.cxx | ||
| xmlencryption_nssimpl.hxx | ||
| xmlsecuritycontext_nssimpl.cxx | ||
| xmlsecuritycontext_nssimpl.hxx | ||
| xmlsignature_nssimpl.cxx | ||
| xmlsignature_nssimpl.hxx | ||
| xsec_nss.cxx | ||