From owner-cvs-all  Tue Feb 19  7:50:41 2002
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 09AD837B405; Tue, 19 Feb 2002 07:50:31 -0800 (PST)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g1JFoVQ22033;
	Tue, 19 Feb 2002 07:50:31 -0800 (PST)
	(envelope-from nectar)
Message-Id: <200202191550.g1JFoVQ22033@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Tue, 19 Feb 2002 07:50:30 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/heimdal/admin ktutil_locl.h src/crypto/heimdal/appl/ftp/ftp
         ftp_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
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/02/19 07:50:30 PST

  Modified files:
    crypto/heimdal/admin ktutil_locl.h 
    crypto/heimdal/appl/ftp/ftp ftp_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:
  Resolve conflicts after import of Heimdal Kerberos 2002/02/17.
  
  Revision  Changes    Path
  1.6       +5 -3      src/crypto/heimdal/admin/ktutil_locl.h
  1.5       +3 -3      src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
  1.6       +7 -4      src/crypto/heimdal/kadmin/kadmin_locl.h
  1.6       +6 -3      src/crypto/heimdal/kdc/headers.h
  1.6       +2 -14     src/crypto/heimdal/lib/hdb/hdb_locl.h
  1.6       +140 -72   src/crypto/heimdal/lib/krb5/crypto.c
  1.7       +6 -18     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