office-gobmx/xmlsecurity/source/xmlsec/nss
Jan Holesovsky 2554b31146 Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
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
2011-04-22 15:08:05 +02:00
..
certerrors.h Remove old RCS lines. 2011-01-21 12:08:20 +01:00
ciphercontext.cxx mav60: #164341# introduce nss initialization for the case when mscrypto is used 2011-03-27 10:36:28 +02:00
ciphercontext.hxx mav60: #164341# fix problems with the new implementation 2011-03-23 14:13:24 +01:00
digestcontext.cxx mav60: #164341# fix problems with the new implementation 2011-03-23 18:59:23 +01:00
digestcontext.hxx mav60: #164341# fix problems with the new implementation 2011-03-23 18:59:23 +01:00
makefile.mk Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
nssinitializer.cxx mav60: #164341# use simple nss initialization in case mscrypto is used 2011-03-27 22:08:02 +02:00
nssinitializer.hxx mav60: #164341# adjust unix builds 2011-03-27 18:41:11 +02:00
nssrenam.h add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
sanextension_nssimpl.cxx tkr38: #i112307# fix nss test run and clean up sources 2011-02-14 11:58:31 +01:00
sanextension_nssimpl.hxx tkr38: #i112307# fix nss test run and clean up sources 2011-02-14 11:58:31 +01:00
secerror.cxx Remove old RCS lines. 2011-01-21 12:08:20 +01:00
secerror.hxx Remove old RCS lines. 2011-01-21 12:08:20 +01:00
securityenvironment_nssimpl.cxx Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
securityenvironment_nssimpl.hxx Remove double line spacing and make long virtuals readable. 2011-01-28 20:13:24 +01:00
seinitializer_nssimpl.cxx Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
seinitializer_nssimpl.hxx Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
x509certificate_nssimpl.cxx Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00
x509certificate_nssimpl.hxx Remove double line spacing and make long virtuals readable. 2011-01-28 20:13:24 +01:00
xmlencryption_nssimpl.cxx Remove 'added by' comments 2011-03-05 16:45:26 +00:00
xmlencryption_nssimpl.hxx add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
xmlsecuritycontext_nssimpl.cxx RTL_CONSTASCII_USTRINGPARAM in components 3 2010-11-28 18:33:53 +01:00
xmlsecuritycontext_nssimpl.hxx add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
xmlsignature_nssimpl.cxx RTL_CONSTASCII_USTRINGPARAM in components 3 2010-11-28 18:33:53 +01:00
xmlsignature_nssimpl.hxx add modelines to .hxx files as well 2010-10-28 15:48:02 +01:00
xsec_nss.cxx Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 2011-04-22 15:08:05 +02:00