Date: Sun, 9 Jan 2000 00:53:36 -0800 (PST) From: Mark Murray <markm@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: <200001090853.AAA17040@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001090853.AAA17040>