]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
fix conflicts from merge
authorAssar Westerlund <assar@FreeBSD.org>
Fri, 29 Dec 2000 21:16:01 +0000 (21:16 +0000)
committerAssar Westerlund <assar@FreeBSD.org>
Fri, 29 Dec 2000 21:16:01 +0000 (21:16 +0000)
commit6e3caa083303aae41395c7ff038ab93ff203208b
tree564e6def471523fb64196a9e9a3ea2cd510fd4d8
parent2a9bc9996cc1964214c65198c735d1caeba63b74
fix conflicts from merge
crypto/kerberosIV/appl/bsd/bsd_locl.h
crypto/kerberosIV/appl/ftp/ftpd/ftpd.c
crypto/kerberosIV/appl/kip/kipd.c
crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c
crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c
crypto/kerberosIV/appl/telnet/telnetd/telnetd.h
crypto/kerberosIV/lib/krb/getaddrs.c
crypto/kerberosIV/man/kinit.1
crypto/kerberosIV/server/kerberos.c