Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 01/09/1997 03:40:02
tls
Wed Jan  8 19:38:55 PST 1997
Update of /a/cvsroot/src/bin/ps
In directory netbsd1:/var/slash-tmp/cvs-serv6829

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/bin/ps/nlist.c
U src/bin/ps/ps.c
U src/bin/ps/Makefile
U src/bin/ps/keyword.c
U src/bin/ps/print.c
C src/bin/ps/fmt.c
U src/bin/ps/extern.h
U src/bin/ps/ps.1
U src/bin/ps/ps.h

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

	cvs checkout -jCSRG:yesterday -jCSRG src/bin/ps