From: Richard Levitte <levitte@openssl.org>
Date: Wed, 20 Sep 2000 17:06:25 +0000 (+0000)
Subject: Merge of main trunk, all conflicts resolved.
X-Git-Tag: OpenSSL-engine-0_9_6-beta3~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=775c289db56ff463d252370caa3aac72aaef1ea3;p=oweals%2Fopenssl.git

Merge of main trunk, all conflicts resolved.
---

diff --git a/doc/ssl/SSL_SESSION_free.pod b/doc/ssl/SSL_SESSION_free.pod
index 5e104d5f2f..df30ccbb32 100644
--- a/doc/ssl/SSL_SESSION_free.pod
+++ b/doc/ssl/SSL_SESSION_free.pod
@@ -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
 
diff --git a/doc/ssl/SSL_free.pod b/doc/ssl/SSL_free.pod
index 3bbde4273c..f3f0c345f8 100644
--- a/doc/ssl/SSL_free.pod
+++ b/doc/ssl/SSL_free.pod
@@ -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