]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
fix conflicts in heimdal 0.3e import
authorAssar Westerlund <assar@FreeBSD.org>
Tue, 13 Feb 2001 16:52:56 +0000 (16:52 +0000)
committerAssar Westerlund <assar@FreeBSD.org>
Tue, 13 Feb 2001 16:52:56 +0000 (16:52 +0000)
commit47085b17ae5042e91e63410798301a96d223db23
tree35034642e4b493c184c22e8a74fa0e234b85238f
parentc25d7ab7414672a680e73cefc0a681d10427bf77
fix conflicts in heimdal 0.3e import
crypto/heimdal/admin/ktutil_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
crypto/heimdal/lib/krb5/krb5_locl.h