Module Name:	cryptosrc-intl
Committed By:	assar
Date:		Thu May 18 02:48:44 UTC 2000

Modified Files:
	cryptosrc-intl/crypto-intl/dist/heimdal/admin: ktutil_locl.h
	cryptosrc-intl/crypto-intl/dist/heimdal/appl/telnet/telnet: commands.c
	    telnet_locl.h
	cryptosrc-intl/crypto-intl/dist/heimdal/kadmin: kadmin_locl.h
	cryptosrc-intl/crypto-intl/dist/heimdal/kuser: klist.c
	cryptosrc-intl/crypto-intl/dist/heimdal/lib/asn1: gen.c
	cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi: 8003.c
	    context_time.c get_mic.c unwrap.c verify_mic.c wrap.c
	cryptosrc-intl/crypto-intl/dist/heimdal/lib/hdb: hdb_locl.h
	cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5: crypto.c get_in_tkt.c
	    init_creds_pw.c krb5-protos.h krb5.h mk_req.c principal.c rd_priv.c
	    rd_req.c time.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/admin/ktutil_locl.h
cvs rdiff -r1.4 -r1.5 \
    cryptosrc-intl/crypto-intl/dist/heimdal/appl/telnet/telnet/commands.c
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/appl/telnet/telnet/telnet_locl.h
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/kadmin/kadmin_locl.h
cvs rdiff -r1.2 -r1.3 cryptosrc-intl/crypto-intl/dist/heimdal/kuser/klist.c
cvs rdiff -r1.2 -r1.3 cryptosrc-intl/crypto-intl/dist/heimdal/lib/asn1/gen.c
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/8003.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/context_time.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/get_mic.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/unwrap.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/verify_mic.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/gssapi/wrap.c
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/hdb/hdb_locl.h
cvs rdiff -r1.3 -r1.4 \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/crypto.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/krb5-protos.h \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/krb5.h \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/rd_req.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/time.c
cvs rdiff -r1.2 -r1.3 \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/get_in_tkt.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/init_creds_pw.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/mk_req.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/principal.c \
    cryptosrc-intl/crypto-intl/dist/heimdal/lib/krb5/rd_priv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.