From owner-cvs-src@FreeBSD.ORG  Thu Oct  9 12:42:10 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 04D5716A4B3; Thu,  9 Oct 2003 12:42:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1D31F43FFB; Thu,  9 Oct 2003 12:42:08 -0700 (PDT)
	(envelope-from nectar@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h99Jg7XJ099806;
	Thu, 9 Oct 2003 12:42:07 -0700 (PDT)
	(envelope-from nectar@repoman.freebsd.org)
Received: (from nectar@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h99Jg7of099803;
	Thu, 9 Oct 2003 12:42:07 -0700 (PDT)
	(envelope-from nectar)
Message-Id: <200310091942.h99Jg7of099803@repoman.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Thu, 9 Oct 2003 12:42:07 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/crypto/heimdal/lib/krb5 crypto.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2003 19:42:10 -0000

nectar      2003/10/09 12:42:07 PDT

  FreeBSD src repository

  Modified files:
    crypto/heimdal/lib/krb5 crypto.c 
  Log:
  Resolve conflicts after import of Heimdal 0.6.
  
  Revision  Changes    Path
  1.9       +479 -27   src/crypto/heimdal/lib/krb5/crypto.c