jtc
Wed Dec 21 22:01:16 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
		
U src/usr.bin/locate/Makefile
C src/usr.bin/locate/bigram/Makefile
C src/usr.bin/locate/bigram/locate.bigram.c
I src/usr.bin/locate/bigram/tags
I src/usr.bin/locate/bigram/obj
C src/usr.bin/locate/code/Makefile
C src/usr.bin/locate/code/locate.code.c
I src/usr.bin/locate/code/tags
I src/usr.bin/locate/code/obj
C src/usr.bin/locate/locate/locate.1
C src/usr.bin/locate/locate/Makefile
C src/usr.bin/locate/locate/locate.c
C src/usr.bin/locate/locate/locate.h
C src/usr.bin/locate/locate/pathnames.h
C src/usr.bin/locate/locate/updatedb.csh
I src/usr.bin/locate/locate/tags
I src/usr.bin/locate/locate/obj

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

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