Merge of main trunk, all conflicts resolved.

This commit is contained in:
Richard Levitte 2000-09-20 17:06:25 +00:00
parent 099f5bfeba
commit 775c289db5
2 changed files with 2 additions and 2 deletions

View file

@ -8,7 +8,7 @@ SSL_SESSION_free - free an allocated SSL_SESSION structure
#include <openssl/ssl.h>
void *SSL_SESSION_free(SSL_SESSION *session);
void SSL_SESSION_free(SSL_SESSION *session);
=head1 DESCRIPTION

View file

@ -8,7 +8,7 @@ SSL_free - free an allocated SSL structure
#include <openssl/ssl.h>
void *SSL_free(SSL *ssl);
void SSL_free(SSL *ssl);
=head1 DESCRIPTION