lukem
Thu Oct 16 22:31:10 PDT 1997
Update of /cvsroot/src/usr.sbin/bad144
In directory netbsd1:/var/slash-tmp/cvs-serv1969

Modified Files:
	Makefile bad144.8 bad144.c 
Log Message:
WARNSify, use err/warn, use opendisk

mrg
Thu Oct 16 22:33:23 PDT 1997
Update of /cvsroot/src/usr.sbin/pstat
In directory netbsd1:/home/mrg/lite2/pstat

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/pstat/pstat.c
U src/usr.sbin/pstat/Makefile
C src/usr.sbin/pstat/pstat.8

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/pstat


mrg
Thu Oct 16 22:34:03 PDT 1997
Update of /cvsroot/src/usr.sbin/pwd_mkdb
In directory netbsd1:/home/mrg/lite2/pwd_mkdb

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/pwd_mkdb/pwd_mkdb.8
U src/usr.sbin/pwd_mkdb/pwd_mkdb.c
U src/usr.sbin/pwd_mkdb/Makefile
U src/usr.sbin/pwd_mkdb/pw_scan.c
U src/usr.sbin/pwd_mkdb/pw_scan.h

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/pwd_mkdb


mrg
Thu Oct 16 22:37:40 PDT 1997
Update of /cvsroot/src/usr.sbin/portmap
In directory netbsd1:/var/slash-tmp/cvs-serv3297

Modified Files:
	Makefile portmap.8 portmap.c 
Log Message:
merge lite-2