christos
Mon Sep 22 18:10:45 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/amd
In directory netbsd1:/var/slash-tmp/cvs-serv10162/amd

Modified Files:
	Makefile am_ops.c amd.8 amd.c amq_subr.c amq_svc.c autil.c 
	conf.c get_args.c info_nis.c info_passwd.c map.c mapc.c 
	mntfs.c nfs_prot_svc.c nfs_start.c nfs_subr.c ops_afs.c 
	ops_cdfs.c ops_host.c ops_nfs.c ops_pcfs.c ops_ufs.c restart.c 
	rpc_fwd.c sched.c 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:10:49 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/amq
In directory netbsd1:/var/slash-tmp/cvs-serv10162/amq

Modified Files:
	amq.8 amq.c amq.h amq_clnt.c 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:11:00 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/doc
In directory netbsd1:/var/slash-tmp/cvs-serv10162/doc

Modified Files:
	Makefile texinfo.tex 
Removed Files:
	amdref.ps amdref.texinfo 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:11:04 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/fsinfo
In directory netbsd1:/var/slash-tmp/cvs-serv10162/fsinfo

Modified Files:
	Makefile fsi_lex.l fsinfo.8 wr_atab.c wr_exportfs.c 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:11:13 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/include
In directory netbsd1:/var/slash-tmp/cvs-serv10162/include

Modified Files:
	am_defs.h am_utils.h amd.h amq_defs.h config.h 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:11:16 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/libamu
In directory netbsd1:/var/slash-tmp/cvs-serv10162/libamu

Modified Files:
	Makefile 
Removed Files:
	xdr_mountres3.c 
Log Message:
Resolve conflicts.


christos
Mon Sep 22 18:11:17 EDT 1997
Update of /a/cvsroot/src/usr.sbin/amd/mk-amd-map
In directory netbsd1:/var/slash-tmp/cvs-serv10162/mk-amd-map

Modified Files:
	mk-amd-map.8 
Log Message:
Resolve conflicts.


scottr
Mon Sep 22 15:13:20 PDT 1997
Update of /cvsroot/src/distrib/mac68k/miniroot
In directory netbsd1:/var/slash-tmp/cvs-serv10681/miniroot

Log Message:
Directory /cvsroot/src/distrib/mac68k/miniroot added to the repository