From owner-cvs-all Fri Aug 9 18:50:55 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23E4437B400; Fri, 9 Aug 2002 18:50:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B758943E3B; Fri, 9 Aug 2002 18:50:50 -0700 (PDT) (envelope-from nectar@FreeBSD.org) Received: from freefall.freebsd.org (nectar@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A1ooJU021668; Fri, 9 Aug 2002 18:50:50 -0700 (PDT) (envelope-from nectar@freefall.freebsd.org) Received: (from nectar@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A1ooKN021667; Fri, 9 Aug 2002 18:50:50 -0700 (PDT) Message-Id: <200208100150.g7A1ooKN021667@freefall.freebsd.org> From: Jacques Vidrine Date: Fri, 9 Aug 2002 18:50:50 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssl/ssl s2_clnt.c s2_enc.c s2_lib.c s2_srvr.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG nectar 2002/08/09 18:50:50 PDT Modified files: crypto/openssl/ssl s2_clnt.c s2_enc.c s2_lib.c s2_srvr.c Log: Resolve conflicts. Revision Changes Path 1.9 +32 -9 src/crypto/openssl/ssl/s2_clnt.c 1.7 +2 -1 src/crypto/openssl/ssl/s2_enc.c 1.8 +23 -9 src/crypto/openssl/ssl/s2_lib.c 1.9 +43 -15 src/crypto/openssl/ssl/s2_srvr.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message