Date: Mon, 16 Sep 2002 14:07:11 -0700 (PDT) From: Jacques Vidrine <nectar@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/hdb hdb_locl.h src/crypto/heimdal/lib/krb5 crypto.c krb5_locl.h Message-ID: <200209162107.g8GL7B5C081508@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
nectar 2002/09/16 14:07:11 PDT
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/hdb hdb_locl.h
crypto/heimdal/lib/krb5 crypto.c krb5_locl.h
Log:
Resolve conflicts.
Revision Changes Path
1.7 +2 -7 src/crypto/heimdal/admin/ktutil_locl.h
1.6 +2 -6 src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
1.7 +1 -6 src/crypto/heimdal/kadmin/kadmin_locl.h
1.7 +2 -6 src/crypto/heimdal/kdc/headers.h
1.7 +2 -6 src/crypto/heimdal/lib/hdb/hdb_locl.h
1.8 +17 -32 src/crypto/heimdal/lib/krb5/crypto.c
1.9 +3 -14 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?200209162107.g8GL7B5C081508>