Merge of stuff from main trunk, all conflicts resolved, and addition
authorRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 17:35:39 +0000 (17:35 +0000)
committerRichard Levitte <levitte@openssl.org>
Mon, 19 Jun 2000 17:35:39 +0000 (17:35 +0000)
commitd8c4d0e81948e5ed4a7cb60039c57bfca1d6991c
tree0c6354d0fd428d51eee8c290721743576cac14ed
parentb215f70a0ee3081b99d0b45241c0b12cdcb4a97c
Merge ... stuff from main trunk, all conflicts resolved, and addition
of dynamic lock support in the nCipher code.
crypto/cryptlib.c
crypto/crypto.h
doc/crypto/threads.pod
util/libeay.num