Module Name:	basesrc
Committed By:	christos
Date:		Fri Nov 29 23:06:27 UTC 2002

Modified Files:
	basesrc/dist/am-utils/amd: amd.8 amd.c amq_subr.c opts.c sched.c
	    srvr_nfs.c
	basesrc/dist/am-utils/amq: amq.8 amq.c pawd.1
	basesrc/dist/am-utils/conf/transp: transp_sockets.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.8 fsinfo.c
	    fsinfo.h
	basesrc/dist/am-utils/hlfsd: hlfsd.8 hlfsd.c hlfsd.h
	basesrc/dist/am-utils/include: am_defs.h am_utils.h amq_defs.h
	basesrc/dist/am-utils/libamu: hasmntopt.c mount_fs.c wire.c xutil.c
	basesrc/dist/am-utils/mk-amd-map: mk-amd-map.8
	basesrc/dist/am-utils/scripts: amd.conf.5 automount2amd.8 expn.in
	basesrc/dist/am-utils/wire-test: wire-test.8

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/amd/amd.8
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/amd/amd.c \
    basesrc/dist/am-utils/amd/opts.c basesrc/dist/am-utils/amd/sched.c
cvs rdiff -r1.5 -r1.6 basesrc/dist/am-utils/amd/amq_subr.c \
    basesrc/dist/am-utils/amd/srvr_nfs.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/amq/amq.8 \
    basesrc/dist/am-utils/amq/pawd.1
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/amq/amq.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/conf/transp/transp_sockets.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/doc/am-utils.texi
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/fixmount/fixmount.8
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/fsinfo/fsi_lex.l \
    basesrc/dist/am-utils/fsinfo/fsinfo.h
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/fsinfo/fsi_util.c \
    basesrc/dist/am-utils/fsinfo/fsinfo.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/fsinfo/fsinfo.8
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/hlfsd/hlfsd.8 \
    basesrc/dist/am-utils/hlfsd/hlfsd.h
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/hlfsd/hlfsd.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/include/am_defs.h
cvs rdiff -r1.3 -r1.4 basesrc/dist/am-utils/include/am_utils.h
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/include/amq_defs.h
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/libamu/hasmntopt.c
cvs rdiff -r1.5 -r1.6 basesrc/dist/am-utils/libamu/mount_fs.c \
    basesrc/dist/am-utils/libamu/xutil.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/am-utils/libamu/wire.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/mk-amd-map/mk-amd-map.8
cvs rdiff -r1.5 -r1.6 basesrc/dist/am-utils/scripts/amd.conf.5
cvs rdiff -r1.2 -r1.3 basesrc/dist/am-utils/scripts/automount2amd.8 \
    basesrc/dist/am-utils/scripts/expn.in
cvs rdiff -r1.4 -r1.5 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.