cgd
Sun May  8 20:31:34 PDT 1994
Update of /b/source/CVS/src/bin/ps
In directory sun-lamp.cs.berkeley.edu:/usr/src/bin/ps

Modified Files:
	Makefile devname.c extern.h keyword.c nlist.c print.c ps.1 
	ps.c ps.h 
Log Message:
clean up import

cgd
Sun May  8 20:32:52 PDT 1994
Update of /b/source/CVS/src/usr.bin/w
In directory sun-lamp.cs.berkeley.edu:/e/users/cgd/trees/w

Revision/Branch: 1.1.1

Log Message:
new w, to match libkvm

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/w/w.1
C src/usr.bin/w/w.c
C src/usr.bin/w/uptime.1
C src/usr.bin/w/Makefile
C src/usr.bin/w/proc_compare.c
N src/usr.bin/w/pr_time.c
N src/usr.bin/w/extern.h
I src/usr.bin/w/obj/attime.o

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

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


cgd
Sun May  8 20:36:13 PDT 1994
Update of /b/source/CVS/src/usr.bin/w
In directory sun-lamp.cs.berkeley.edu:/usr/src/usr.bin/w

Modified Files:
	Makefile proc_compare.c uptime.1 w.1 w.c 
Log Message:
clean up import

------------------------------------------------------------------------------