From owner-cvs-all  Fri Aug 30 14:25:39 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 ADE4737B401; Fri, 30 Aug 2002 14:25:15 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6168643E42; Fri, 30 Aug 2002 14:25:15 -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 g7ULPFJU036136;
	Fri, 30 Aug 2002 14:25:15 -0700 (PDT)
	(envelope-from nectar@freefall.freebsd.org)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ULPFUh036135;
	Fri, 30 Aug 2002 14:25:15 -0700 (PDT)
Message-Id: <200208302125.g7ULPFUh036135@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Fri, 30 Aug 2002 14:25:15 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/heimdal/lib/krb5 crypto.c krb5_locl.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

nectar      2002/08/30 14:25:15 PDT

  Modified files:
    crypto/heimdal/lib/krb5 crypto.c krb5_locl.h 
  Log:
  Resolve conflicts after import of Heimdal Kerberos circa 2002/08/29.
  
  Revision  Changes    Path
  1.7       +38 -24    src/crypto/heimdal/lib/krb5/crypto.c
  1.8       +7 -4      src/crypto/heimdal/lib/krb5/krb5_locl.h

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message