Uhmmm, how did those conflicts get through?
authorRichard Levitte <levitte@openssl.org>
Fri, 9 Mar 2001 15:11:16 +0000 (15:11 +0000)
committerRichard Levitte <levitte@openssl.org>
Fri, 9 Mar 2001 15:11:16 +0000 (15:11 +0000)
commitc540bd28518328e7de9cf1b1af2d4b12e7c9e776
tree22cfb60695bdc7d4b6639e1e38e85c7747686f46
parent6ad07762364d3f2e48568d43f5b216d9f385150e
Uhmmm, how did those conflicts get through?
apps/s_client.c
apps/s_server.c