jtc
Wed Dec 21 17:10:48 PST 1994
Update of /b/source/CVS/src/usr.bin/locate
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/locate/Makefile

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

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


jtc
Wed Dec 21 17:12:01 PST 1994
Update of /b/source/CVS/src/usr.bin/lock
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite

Status:

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

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

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


jtc
Wed Dec 21 17:16:23 PST 1994
Update of /b/source/CVS/src/usr.bin/lock
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/lock

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