git.librecmc.org Git - oweals/openssl.git/commit

projects / oweals / openssl.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 42cc160) | patch

author	Richard Levitte <levitte@openssl.org>
	Sun, 17 Sep 2000 20:37:33 +0000 (20:37 +0000)
committer	Richard Levitte <levitte@openssl.org>
	Sun, 17 Sep 2000 20:37:33 +0000 (20:37 +0000)
commit	ce6990739eaa9f8a4a232cdb2fa008ce08480fec
tree	af949a223309952491cd74f126fbeb13a43f1b87	tree \| snapshot
parent	42cc16030197d74058b1350052f0c3df0db0b8ce	commit \| diff

The rest of the merge in of the main trunk, a few conflicts resolved.

32 files changed:

Configure		diff \| blob \| history
README		diff \| blob \| history
TABLE		diff \| blob \| history
apps/apps.c		diff \| blob \| history
apps/crl2p7.c		diff \| blob \| history
apps/dgst.c		diff \| blob \| history
apps/nseq.c		diff \| blob \| history
apps/pkcs12.c		diff \| blob \| history
crypto/asn1/a_set.c		diff \| blob \| history
crypto/bn/asm/README		diff \| blob \| history
crypto/bn/asm/pa-risc2.s		diff \| blob \| history
crypto/dso/dso_lib.c		diff \| blob \| history
crypto/opensslv.h		diff \| blob \| history
crypto/pkcs12/p12_attr.c		diff \| blob \| history
crypto/pkcs12/p12_crt.c		diff \| blob \| history
crypto/pkcs12/p12_npas.c		diff \| blob \| history
crypto/pkcs7/pk7_doit.c		diff \| blob \| history
crypto/pkcs7/pk7_mime.c		diff \| blob \| history
crypto/pkcs7/pk7_smime.c		diff \| blob \| history
crypto/rand/rand_win.c		diff \| blob \| history
crypto/x509v3/v3_akey.c		diff \| blob \| history
crypto/x509v3/v3_alt.c		diff \| blob \| history
crypto/x509v3/v3_crld.c		diff \| blob \| history
crypto/x509v3/v3_extku.c		diff \| blob \| history
crypto/x509v3/v3_genn.c		diff \| blob \| history
crypto/x509v3/v3_info.c		diff \| blob \| history
crypto/x509v3/v3_utl.c		diff \| blob \| history
doc/crypto/BIO_s_fd.pod		diff \| blob \| history
doc/crypto/BIO_s_file.pod		diff \| blob \| history
ssl/ssl_cert.c		diff \| blob \| history
ssl/ssl_ciph.c		diff \| blob \| history
ssl/ssl_lib.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.