Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 01/09/1997 14:40:02
tls
Thu Jan  9 06:31:51 PST 1997
Update of /a/cvsroot/src/usr.bin/renice
In directory netbsd1:/var/slash-tmp/cvs-serv2115

Log Message:
Import from 4.4BSD-Lite2

Status:

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

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

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


tls
Thu Jan  9 06:39:12 PST 1997
Update of /a/cvsroot/src/usr.bin/renice
In directory netbsd1:/var/slash-tmp/cvs-serv2920

Modified Files:
	Makefile renice.8 renice.c 
Log Message:
Sync to 4.4BSD-Lite2