From owner-cvs-all  Tue Feb 13  8:53: 8 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 98A0037B491; Tue, 13 Feb 2001 08:52:58 -0800 (PST)
Received: (from assar@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1DGqwn36607;
	Tue, 13 Feb 2001 08:52:58 -0800 (PST)
	(envelope-from assar)
Message-Id: <200102131652.f1DGqwn36607@freefall.freebsd.org>
From: Assar Westerlund <assar@FreeBSD.org>
Date: Tue, 13 Feb 2001 08:52:58 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/heimdal/admin ktutil_locl.h src/crypto/heimdal/kadmin
         kadmin_locl.h src/crypto/heimdal/kdc headers.h
         src/crypto/heimdal/lib/hdb hdb_locl.h src/crypto/heimdal/lib/krb5
         crypto.c krb5_locl.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

assar       2001/02/13 08:52:56 PST

  Modified files:
    crypto/heimdal/admin ktutil_locl.h 
    crypto/heimdal/kadmin kadmin_locl.h 
    crypto/heimdal/kdc   headers.h 
    crypto/heimdal/lib/hdb hdb_locl.h 
    crypto/heimdal/lib/krb5 crypto.c krb5_locl.h 
  Log:
  fix conflicts in heimdal 0.3e import
  
  Revision  Changes    Path
  1.4       +2 -1      src/crypto/heimdal/admin/ktutil_locl.h
  1.4       +29 -2     src/crypto/heimdal/kadmin/kadmin_locl.h
  1.4       +9 -1      src/crypto/heimdal/kdc/headers.h
  1.4       +4 -2      src/crypto/heimdal/lib/hdb/hdb_locl.h
  1.4       +753 -142  src/crypto/heimdal/lib/krb5/crypto.c
  1.4       +26 -2     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