Date: Thu, 24 Feb 2000 05:37:41 -0800 (PST) From: Mark Murray <markm@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/heimdal/admin ktutil_locl.h src/crypto/heimdal/appl/ftp/ftp ftp_locl.h src/crypto/heimdal/kadmin kadmin_locl.h src/crypto/heimdal/kdc headers.h src/crypto/heimdal/lib/des rc4_enc.c rc4_skey.c src/crypto/heimdal/lib/hdb hdb_locl.h ... Message-ID: <200002241337.FAA07224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 2000/02/24 05:37:41 PST
Modified files:
crypto/heimdal/admin ktutil_locl.h
crypto/heimdal/appl/ftp/ftp ftp_locl.h
crypto/heimdal/kadmin kadmin_locl.h
crypto/heimdal/kdc headers.h
crypto/heimdal/lib/des rc4_enc.c rc4_skey.c
crypto/heimdal/lib/hdb hdb_locl.h
crypto/heimdal/lib/krb5 crypto.c krb5_locl.h
Log:
Merge conflicts.
Revision Changes Path
1.2 +4 -3 src/crypto/heimdal/admin/ktutil_locl.h
1.2 +2 -1 src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
1.2 +4 -2 src/crypto/heimdal/kadmin/kadmin_locl.h
1.2 +4 -2 src/crypto/heimdal/kdc/headers.h
1.2 +3 -2 src/crypto/heimdal/lib/des/rc4_enc.c
1.2 +3 -2 src/crypto/heimdal/lib/des/rc4_skey.c
1.2 +4 -2 src/crypto/heimdal/lib/hdb/hdb_locl.h
1.2 +70 -62 src/crypto/heimdal/lib/krb5/crypto.c
1.2 +2 -1 src/crypto/heimdal/lib/krb5/krb5_locl.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?200002241337.FAA07224>