Module Name:	basesrc
Committed By:	veego
Date:		Sun May 13 18:07:01 UTC 2001

Modified Files:
	basesrc/dist/am-utils/amd: amd.c amq_subr.c opts.c sched.c srvr_nfs.c
	basesrc/dist/am-utils/doc: am-utils.texi
	basesrc/dist/am-utils/fixmount: fixmount.8
	basesrc/dist/am-utils/fsinfo: fsi_lex.l fsi_util.c fsinfo.c fsinfo.h
	basesrc/dist/am-utils/hlfsd: hlfsd.c
	basesrc/dist/am-utils/include: am_utils.h amq_defs.h
	basesrc/dist/am-utils/libamu: mount_fs.c wire.c xutil.c
	basesrc/dist/am-utils/scripts: amd.conf.5
	basesrc/dist/am-utils/wire-test: wire-test.8
Removed Files:
	basesrc/dist/am-utils/aux/macros: opt_amq_mount.m4
	basesrc/dist/am-utils/conf/trap: trap_hpux11.h

Log Message:
Resolve conflicts from the import of am-utils 6.0.6.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/amd/amd.c \
    basesrc/dist/am-utils/amd/opts.c basesrc/dist/am-utils/amd/sched.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/amd/amq_subr.c \
    basesrc/dist/am-utils/amd/srvr_nfs.c
cvs rdiff -r1.1.1.1 -r0 basesrc/dist/am-utils/aux/macros/opt_amq_mount.m4
cvs rdiff -r1.1.1.2 -r0 basesrc/dist/am-utils/conf/trap/trap_hpux11.h
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/doc/am-utils.texi
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/fixmount/fixmount.8
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/fsinfo/fsi_lex.l \
    basesrc/dist/am-utils/fsinfo/fsi_util.c \
    basesrc/dist/am-utils/fsinfo/fsinfo.h
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/fsinfo/fsinfo.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/hlfsd/hlfsd.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/include/am_utils.h
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/include/amq_defs.h
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/libamu/mount_fs.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/libamu/wire.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/libamu/xutil.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/scripts/amd.conf.5
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/wire-test/wire-test.8

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