jtc
Mon Dec  5 23:32:31 PST 1994
Update of /b/source/CVS/src/usr.bin/users
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/users

Modified Files:
	Makefile users.1 users.c 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.


jtc
Mon Dec  5 23:33:59 PST 1994
Update of /b/source/CVS/src/usr.bin/unvis
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/unvis/Makefile
I src/usr.bin/unvis/tags
C src/usr.bin/unvis/unvis.1
C src/usr.bin/unvis/unvis.c

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

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


jtc
Mon Dec  5 23:36:11 PST 1994
Update of /b/source/CVS/src/usr.bin/unvis
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/unvis

Modified Files:
	Makefile unvis.1 unvis.c 
Log Message:
Merged with 4.4lite
Changed to conform to NetBSD's new RCS Id convention.


jtc
Mon Dec  5 23:38:05 PST 1994
Update of /b/source/CVS/src/usr.bin/uniq
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/uniq/Makefile
I src/usr.bin/uniq/tags
C src/usr.bin/uniq/uniq.1
C src/usr.bin/uniq/uniq.c

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

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