Merge of main trunk, no conflicts this time.
authorRichard Levitte <levitte@openssl.org>
Mon, 11 Sep 2000 13:23:47 +0000 (13:23 +0000)
committerRichard Levitte <levitte@openssl.org>
Mon, 11 Sep 2000 13:23:47 +0000 (13:23 +0000)
commit25814b969024fc7976ee2b82be84271f3aeee149
tree846d919c4e371c1756c8237531fbd4a39622d4d7
parent0fc7c5010d214299c83173f1664fa002bfccd7fe
Merge of main trunk, no conflicts this time.
make update
apps/Makefile.ssl
crypto/rand/rand_win.c
util/libeay.num
util/ssleay.num