mrg
Fri Oct 17 03:37:17 PDT 1997
Update of /cvsroot/src/share/man
In directory netbsd1:/home/mrg/share/man/shadow

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/share/man/man0/Makefile
C src/share/man/man3/queue.3
C src/share/man/man4/Makefile
C src/share/man/man4/man4.sparc/Makefile
C src/share/man/man4/man4.sparc/bwtwo.4
C src/share/man/man4/man4.sparc/cgthree.4
C src/share/man/man4/man4.sparc/le.4
C src/share/man/man4/man4.sparc/mem.4
C src/share/man/man4/man4.sparc/openprom.4
C src/share/man/man4/man4.sparc/cgsix.4
C src/share/man/man5/a.out.5
C src/share/man/man5/utmp.5
C src/share/man/man5/remote.5
C src/share/man/man7/hier.7
C src/share/man/man7/mdoc.samples.7
C src/share/man/man7/mdoc.7

16 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/share/man


lukem
Fri Oct 17 03:38:26 PDT 1997
Update of /cvsroot/src/usr.sbin/mopd
In directory netbsd1:/var/slash-tmp/cvs-serv3672

Modified Files:
	Makefile Makefile.inc 
Log Message:
fix race condition when building libcommon.a with make -j, use ../Makefile.inc

lukem
Fri Oct 17 03:38:38 PDT 1997
Update of /cvsroot/src/usr.sbin/mrouted
In directory netbsd1:/var/slash-tmp/cvs-serv3618

Modified Files:
	callout.c defs.h igmp.c main.c mrouted.8 prune.c 
Log Message:
WARNSify