Module Name:	basesrc
Committed By:	thorpej
Date:		Sat Apr  7 21:29:27 UTC 2001

Modified Files:
	basesrc/crypto/dist/heimdal/appl/dceutils: ChangeLog Makefile.am
	    Makefile.in testpag.c
	basesrc/crypto/dist/heimdal/cf: aix.m4 krb-readline.m4 roken-frag.m4
	basesrc/crypto/dist/heimdal/doc: setup.texi
	basesrc/crypto/dist/heimdal/kadmin: add-random-users.c kadm_conn.c
	basesrc/crypto/dist/heimdal/kdc: 524.c
	basesrc/crypto/dist/heimdal/kpasswd: kpasswd-generator.c
	basesrc/crypto/dist/heimdal/kuser: generate-requests.c
	basesrc/crypto/dist/heimdal/lib/kdfs: ChangeLog Makefile.am Makefile.in
	    k5dfspag.c
	basesrc/crypto/dist/heimdal/lib/roken: strlcat.c strlcpy.c write_pid.c
	basesrc/crypto/dist/heimdal/lib/vers: ChangeLog Makefile.am Makefile.in

Log Message:
Reduce diffs with 0.3e (mostly, complete the merge).


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/dceutils/ChangeLog \
    basesrc/crypto/dist/heimdal/appl/dceutils/Makefile.am \
    basesrc/crypto/dist/heimdal/appl/dceutils/Makefile.in \
    basesrc/crypto/dist/heimdal/appl/dceutils/testpag.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/cf/aix.m4 \
    basesrc/crypto/dist/heimdal/cf/krb-readline.m4 \
    basesrc/crypto/dist/heimdal/cf/roken-frag.m4
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/doc/setup.texi
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/kadmin/add-random-users.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kadmin/kadm_conn.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kdc/524.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/kpasswd/kpasswd-generator.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/kuser/generate-requests.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/kdfs/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/kdfs/Makefile.am \
    basesrc/crypto/dist/heimdal/lib/kdfs/Makefile.in \
    basesrc/crypto/dist/heimdal/lib/kdfs/k5dfspag.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/roken/strlcat.c \
    basesrc/crypto/dist/heimdal/lib/roken/strlcpy.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/roken/write_pid.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/vers/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/vers/Makefile.am \
    basesrc/crypto/dist/heimdal/lib/vers/Makefile.in

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