From owner-cvs-all Tue Jul 30 5:47:19 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 9BFD037B401; Tue, 30 Jul 2002 05:46:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AC6943E3B; Tue, 30 Jul 2002 05:46: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 g6UCknJU066624; Tue, 30 Jul 2002 05:46:49 -0700 (PDT) (envelope-from nectar@freefall.freebsd.org) Received: (from nectar@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UCknI0066623; Tue, 30 Jul 2002 05:46:49 -0700 (PDT) Message-Id: <200207301246.g6UCknI0066623@freefall.freebsd.org> From: Jacques Vidrine Date: Tue, 30 Jul 2002 05:46:49 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssl/apps speed.c src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/rsa rsa.h 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/07/30 05:46:49 PDT Modified files: crypto/openssl/apps speed.c crypto/openssl/crypto/evp evp.h crypto/openssl/crypto/rsa rsa.h Log: Resolve conflicts after import of OpenSSL 0.9.6d. Revision Changes Path 1.9 +26 -7 src/crypto/openssl/apps/speed.c 1.10 +1 -1 src/crypto/openssl/crypto/evp/evp.h 1.8 +11 -6 src/crypto/openssl/crypto/rsa/rsa.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message