From owner-source-changes@NetBSD.ORG Thu Dec 22 06:26:03 1994 Return-Path: owner-source-changes@NetBSD.ORG Received: from pain.lcs.mit.edu (pain.lcs.mit.edu [128.52.46.239]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id GAA13294; Thu, 22 Dec 1994 06:26:02 GMT Received: (from daemon@localhost) by pain.lcs.mit.edu (8.6.9/8.6.9) id AAA00761 for source-changes-outgoing; Thu, 22 Dec 1994 00:04:12 -0500 Received: from sun-lamp.cs.berkeley.edu by pain.lcs.mit.edu (8.6.9/8.6.9) with ESMTP id AAA00757 for ; Thu, 22 Dec 1994 00:04:06 -0500 Received: (from srcmastr@localhost) by sun-lamp.cs.berkeley.edu (8.6.9/8.6.9) id WAA10760 for source-changes; Wed, 21 Dec 1994 22:10:02 -0800 Date: Wed, 21 Dec 1994 22:10:02 -0800 From: The Source Master Message-Id: <199412220610.WAA10760@sun-lamp.cs.berkeley.edu> To: source-changes@NetBSD.ORG Subject: sun-lamp CVS commits Sender: owner-source-changes@NetBSD.ORG Precedence: list X-Loop: source-changes@NetBSD.ORG 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