]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
resolve conflicts.
authormarkm <markm@FreeBSD.org>
Sun, 9 Jan 2000 08:53:35 +0000 (08:53 +0000)
committermarkm <markm@FreeBSD.org>
Sun, 9 Jan 2000 08:53:35 +0000 (08:53 +0000)
commit3b8aea4be2ada961cb350b94acbafcaf54462007
treec7ad4d39cba5c19d772f332ae94cfa366244cfd4
parentd4fab19dc22635ccf52db709b672a5f967edb488
resolve conflicts.
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