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

projects / oweals / openssl.git / commit

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

author	Bodo Möller <bodo@openssl.org>
	Fri, 2 Aug 2002 11:38:07 +0000 (11:38 +0000)
committer	Bodo Möller <bodo@openssl.org>
	Fri, 2 Aug 2002 11:38:07 +0000 (11:38 +0000)
commit	1ce60f02d398b6f13b72c07daf0edc36a87eb6cf
tree	f37ba55682185c32a6fd9f14e442f1042eeb2d33	tree \| snapshot
parent	bb34d6de74b24026c7e7e3c8400bd8d77679d899	commit \| diff

merge in changes in OpenSSL_0_9_6-stable (conflicts resolved)

20 files changed:

CHANGES		diff \| blob \| history
Configure		diff \| blob \| history
Makefile.org		diff \| blob \| history
PROBLEMS		diff \| blob \| history
STATUS		diff \| blob \| history
config		diff \| blob \| history
crypto/cryptlib.h		diff \| blob \| history
crypto/mem.c		diff \| blob \| history
ssl/s2_clnt.c		diff \| blob \| history
ssl/s2_enc.c		diff \| blob \| history
ssl/s2_lib.c		diff \| blob \| history
ssl/s2_srvr.c		diff \| blob \| history
ssl/s3_clnt.c		diff \| blob \| history
ssl/s3_srvr.c		diff \| blob \| history
ssl/ssl.h		diff \| blob \| history
ssl/ssl_asn1.c		diff \| blob \| history
ssl/ssl_err.c		diff \| blob \| history
ssl/ssl_locl.h		diff \| blob \| history
ssl/ssl_sess.c		diff \| blob \| history
util/mkerr.pl		diff \| blob \| history

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