From owner-cvs-all@FreeBSD.ORG  Sun Jul 30 14:17:54 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
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 CA93816A4DF;
	Sun, 30 Jul 2006 14:17:54 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F3E243D45;
	Sun, 30 Jul 2006 14:17:54 +0000 (GMT)
	(envelope-from simon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6UEHs5M063714;
	Sun, 30 Jul 2006 14:17:54 GMT
	(envelope-from simon@repoman.freebsd.org)
Received: (from simon@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6UEHsSl063713;
	Sun, 30 Jul 2006 14:17:54 GMT (envelope-from simon)
Message-Id: <200607301417.k6UEHsSl063713@repoman.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Sun, 30 Jul 2006 14:17:54 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/crypto/openssl/crypto/engine eng_padlock.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jul 2006 14:17:54 -0000

simon       2006-07-30 14:17:54 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssl/crypto/engine eng_padlock.c 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.8b.
  
  This was missed the first time around since eng_padlock.c was not part
  of OpenSSL 0.9.7e and therefor did not have the v0_9_7e CVS tag used
  during original resolve of conflicts.
  
  Noticed by:     Antoine Brodin <antoine.brodin@laposte.net>
  
  Revision  Changes    Path
  1.3       +215 -53   src/crypto/openssl/crypto/engine/eng_padlock.c