mrg
Sat Oct 18 04:30:30 PDT 1997
Update of /cvsroot/src/usr.bin/head
In directory netbsd1:/home/mrg/lite2/usr.bin/head

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
L src/usr.bin/head/obj
C src/usr.bin/head/head.1
C src/usr.bin/head/Makefile
C src/usr.bin/head/head.c
I src/usr.bin/head/tags

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/head


mrg
Sat Oct 18 04:31:37 PDT 1997
Update of /cvsroot/src/usr.bin/hexdump
In directory netbsd1:/home/mrg/lite2/usr.bin/hexdump

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/hexdump/conv.c
C src/usr.bin/hexdump/display.c
C src/usr.bin/hexdump/od.1
C src/usr.bin/hexdump/Makefile
C src/usr.bin/hexdump/hexdump.1
C src/usr.bin/hexdump/hexdump.c
C src/usr.bin/hexdump/hexdump.h
C src/usr.bin/hexdump/hexsyntax.c
C src/usr.bin/hexdump/odsyntax.c
C src/usr.bin/hexdump/parse.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/hexdump


mrg
Sat Oct 18 04:32:14 PDT 1997
Update of /cvsroot/src/usr.bin/rdist
In directory netbsd1:/home/mrg/lite2/usr.bin/rdist

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/rdist/Makefile
C src/usr.bin/rdist/rdist.1
C src/usr.bin/rdist/defs.h
C src/usr.bin/rdist/main.c
C src/usr.bin/rdist/expand.c
C src/usr.bin/rdist/gram.y
C src/usr.bin/rdist/lookup.c
C src/usr.bin/rdist/docmd.c
C src/usr.bin/rdist/cron.entry
C src/usr.bin/rdist/pathnames.h
C src/usr.bin/rdist/server.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/rdist


mrg
Sat Oct 18 04:32:50 PDT 1997
Update of /cvsroot/src/usr.bin/vmstat
In directory netbsd1:/home/mrg/lite2/usr.bin/vmstat

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.bin/vmstat/Makefile
U src/usr.bin/vmstat/names.c
U src/usr.bin/vmstat/vmstat.8
C src/usr.bin/vmstat/vmstat.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/vmstat


lukem
Sat Oct 18 04:37:19 PDT 1997
Update of /cvsroot/src/usr.sbin/rwhod
In directory netbsd1:/var/slash-tmp/cvs-serv14733

Modified Files:
	rwhod.c 
Log Message:
deprecate register, use warn/err

lukem
Sat Oct 18 04:37:52 PDT 1997
Update of /cvsroot/src/usr.sbin/screenblank
In directory netbsd1:/var/slash-tmp/cvs-serv14809

Modified Files:
	screenblank.c 
Log Message:
use memset instead of bzero

lukem
Sat Oct 18 04:38:32 PDT 1997
Update of /cvsroot/src/usr.sbin/slstats
In directory netbsd1:/var/slash-tmp/cvs-serv14947

Modified Files:
	slstats.c 
Log Message:
deprecate register, s/bcopy/memmove

mrg
Sat Oct 18 04:38:33 PDT 1997
Update of /cvsroot/src/usr.bin/fstat
In directory netbsd1:/var/slash-tmp/cvs-serv14950

Modified Files:
	fstat.c 
Log Message:
merge lite-2.