From owner-cvs-all  Mon Sep 16 14: 7:13 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 305B837B401; Mon, 16 Sep 2002 14:07:12 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BC86643E7B; Mon, 16 Sep 2002 14:07:11 -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 g8GL7BJU081509;
	Mon, 16 Sep 2002 14:07:11 -0700 (PDT)
	(envelope-from nectar@freefall.freebsd.org)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8GL7B5C081508;
	Mon, 16 Sep 2002 14:07:11 -0700 (PDT)
Message-Id: <200209162107.g8GL7B5C081508@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Mon, 16 Sep 2002 14:07:11 -0700 (PDT)
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/09/16 14:07:11 PDT

  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.
  
  Revision  Changes    Path
  1.7       +2 -7      src/crypto/heimdal/admin/ktutil_locl.h
  1.6       +2 -6      src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
  1.7       +1 -6      src/crypto/heimdal/kadmin/kadmin_locl.h
  1.7       +2 -6      src/crypto/heimdal/kdc/headers.h
  1.7       +2 -6      src/crypto/heimdal/lib/hdb/hdb_locl.h
  1.8       +17 -32    src/crypto/heimdal/lib/krb5/crypto.c
  1.9       +3 -14     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