Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 9 Jan 2000 10:23:29 +0200 (SAST)
From:      Mark Murray <markm@internat.freebsd.org>
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
Message-ID:  <200001090823.KAA61975@internat.freebsd.org>
next in thread | raw e-mail | index | archive | help 

markm       2000/01/09 10:23:29 SAST

FreeBSD International Crypto Repository

  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       +564 -315  src/crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
  1.4       +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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001090823.KAA61975>