From owner-cvs-all  Sun Jan  9  0:53:39 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 4421114CBE; Sun,  9 Jan 2000 00:53:37 -0800 (PST)
	(envelope-from markm@FreeBSD.org)
Received: (from markm@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA17040;
	Sun, 9 Jan 2000 00:53:37 -0800 (PST)
	(envelope-from markm@FreeBSD.org)
Message-Id: <200001090853.AAA17040@freefall.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 9 Jan 2000 00:53:36 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/kerberosIV/appl/bsd bsd_locl.h src/crypto/kerberosIV/appl/ftp/ftpd
         ftpd.c src/crypto/kerberosIV/doc kth-krb.texi
         src/crypto/kerberosIV/lib/kafs kafs.h src/crypto/kerberosIV/lib/krb
         krb.h
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

markm       2000/01/09 00:53:36 PST

  Modified files:
    crypto/kerberosIV/appl/bsd bsd_locl.h 
    crypto/kerberosIV/appl/ftp/ftpd ftpd.c 
    crypto/kerberosIV/doc kth-krb.texi 
    crypto/kerberosIV/lib/kafs kafs.h 
    crypto/kerberosIV/lib/krb krb.h 
  Log:
  resolve conflicts.
  
  Revision  Changes    Path
  1.3       +3 -8      src/crypto/kerberosIV/appl/bsd/bsd_locl.h
  1.4       +566 -315  src/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
  1.3       +4 -9      src/crypto/kerberosIV/doc/kth-krb.texi
  1.4       +3 -8      src/crypto/kerberosIV/lib/kafs/kafs.h
  1.5       +6 -4      src/crypto/kerberosIV/lib/krb/krb.h



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