Module Name:	src
Committed By:	christos
Date:		Sat Apr 23 18:38:19 UTC 2005

Modified Files:
	src/dist/am-utils/amd: am_ops.c amd.8 amd.c amd.h amfs_auto.c
	    amfs_host.c amfs_toplvl.c amq_subr.c autil.c get_args.c
	    info_hesiod.c info_ldap.c info_ndbm.c info_passwd.c info_union.c
	    map.c mapc.c mntfs.c nfs_start.c nfs_subr.c ops_cachefs.c ops_nfs.c
	    ops_ufs.c opts.c sched.c srvr_nfs.c
	src/dist/am-utils/amq: amq.8 amq.c pawd.1 pawd.c
	src/dist/am-utils/conf/checkmount: checkmount_bsd44.c
	src/dist/am-utils/conf/mtab: mtab_bsd.c
	src/dist/am-utils/conf/transp: transp_sockets.c
	src/dist/am-utils/doc: am-utils.texi
	src/dist/am-utils/fixmount: fixmount.8 fixmount.c
	src/dist/am-utils/fsinfo: fsi_analyze.c fsi_lex.l fsi_util.c fsinfo.8
	    fsinfo.c fsinfo.h wr_atab.c wr_fstab.c
	src/dist/am-utils/hlfsd: hlfsd.8 hlfsd.c hlfsd.h homedir.c
	src/dist/am-utils/include: am_defs.h am_utils.h amq_defs.h
	src/dist/am-utils/libamu: hasmntopt.c misc_rpc.c mount_fs.c
	    strcasecmp.c strerror.c wire.c xutil.c
	src/dist/am-utils/mk-amd-map: mk-amd-map.8 mk-amd-map.c
	src/dist/am-utils/scripts: amd.conf.5 automount2amd.8
	src/dist/am-utils/wire-test: wire-test.8
Removed Files:
	src/dist/am-utils: amd2netbsd o
	src/dist/am-utils/amd: amfs_inherit.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r0 src/dist/am-utils/amd2netbsd
cvs rdiff -r1.1.1.1 -r0 src/dist/am-utils/o
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/amd/am_ops.c \
    src/dist/am-utils/amd/autil.c src/dist/am-utils/amd/info_hesiod.c \
    src/dist/am-utils/amd/map.c src/dist/am-utils/amd/ops_nfs.c
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/amd/amd.8 src/dist/am-utils/amd/amd.c \
    src/dist/am-utils/amd/opts.c
cvs rdiff -r1.2 -r1.3 src/dist/am-utils/amd/amd.h
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/amd/amfs_auto.c \
    src/dist/am-utils/amd/amfs_host.c src/dist/am-utils/amd/nfs_start.c
cvs rdiff -r1.1.1.7 -r0 src/dist/am-utils/amd/amfs_inherit.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/amd/amfs_toplvl.c \
    src/dist/am-utils/amd/get_args.c src/dist/am-utils/amd/info_ldap.c \
    src/dist/am-utils/amd/info_ndbm.c src/dist/am-utils/amd/info_passwd.c \
    src/dist/am-utils/amd/info_union.c src/dist/am-utils/amd/mapc.c \
    src/dist/am-utils/amd/mntfs.c src/dist/am-utils/amd/nfs_subr.c \
    src/dist/am-utils/amd/ops_cachefs.c src/dist/am-utils/amd/ops_ufs.c
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/amd/amq_subr.c \
    src/dist/am-utils/amd/srvr_nfs.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/amd/sched.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/amq/amq.8 \
    src/dist/am-utils/amq/pawd.1
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/amq/amq.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/amq/pawd.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/conf/checkmount/checkmount_bsd44.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/conf/mtab/mtab_bsd.c
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/conf/transp/transp_sockets.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/doc/am-utils.texi
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/fixmount/fixmount.8
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/fixmount/fixmount.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/fsinfo/fsi_analyze.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/fsinfo/fsi_lex.l \
    src/dist/am-utils/fsinfo/fsinfo.8
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/fsinfo/fsi_util.c
cvs rdiff -r1.10 -r1.11 src/dist/am-utils/fsinfo/fsinfo.c
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/fsinfo/fsinfo.h
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/fsinfo/wr_atab.c
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/fsinfo/wr_fstab.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/hlfsd/hlfsd.8 \
    src/dist/am-utils/hlfsd/hlfsd.h
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/hlfsd/hlfsd.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/hlfsd/homedir.c
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/include/am_defs.h
cvs rdiff -r1.9 -r1.10 src/dist/am-utils/include/am_utils.h
cvs rdiff -r1.7 -r1.8 src/dist/am-utils/include/amq_defs.h
cvs rdiff -r1.6 -r1.7 src/dist/am-utils/libamu/hasmntopt.c
cvs rdiff -r1.4 -r1.5 src/dist/am-utils/libamu/misc_rpc.c
cvs rdiff -r1.11 -r1.12 src/dist/am-utils/libamu/mount_fs.c \
    src/dist/am-utils/libamu/xutil.c
cvs rdiff -r1.2 -r1.3 src/dist/am-utils/libamu/strcasecmp.c
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/libamu/strerror.c
cvs rdiff -r1.8 -r1.9 src/dist/am-utils/libamu/wire.c
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/mk-amd-map/mk-amd-map.8
cvs rdiff -r1.3 -r1.4 src/dist/am-utils/mk-amd-map/mk-amd-map.c
cvs rdiff -r1.10 -r1.11 src/dist/am-utils/scripts/amd.conf.5
cvs rdiff -r1.5 -r1.6 src/dist/am-utils/scripts/automount2amd.8
cvs rdiff -r1.7 -r1.8 src/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.