Module Name:	basesrc
Committed By:	assar
Date:		Sun Feb 11 16:08:42 UTC 2001

Modified Files:
	basesrc/crypto/dist/heimdal/lib/krb5: changepw.c crypto.c mcache.c
	basesrc/crypto/dist/heimdal/lib/sl: lex.l

Log Message:
fix merge-ups


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/krb5/changepw.c \
    basesrc/crypto/dist/heimdal/lib/krb5/crypto.c
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/heimdal/lib/krb5/mcache.c
cvs rdiff -r1.1.1.3 -r1.2 basesrc/crypto/dist/heimdal/lib/sl/lex.l

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