source-changes: sun-lamp CVS commits

Subject: sun-lamp CVS commits
To: None <source-changes@pain.lcs.mit.edu>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 08/31/1995 20:30:02

jtc
Thu Aug 31 20:24:52 EDT 1995
Update of /a/cvsroot/src/usr.bin/find
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/find/Makefile
C src/usr.bin/find/option.c
C src/usr.bin/find/operator.c
I src/usr.bin/find/obj
C src/usr.bin/find/misc.c
C src/usr.bin/find/main.c
C src/usr.bin/find/ls.c
C src/usr.bin/find/function.c
C src/usr.bin/find/find.h
C src/usr.bin/find/find.c
C src/usr.bin/find/find.1
C src/usr.bin/find/extern.h
I src/usr.bin/find/tags

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

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


jtc
Thu Aug 31 20:25:50 EDT 1995
Update of /a/cvsroot/src/usr.bin/finger
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/finger/Makefile
I src/usr.bin/finger/tags
C src/usr.bin/finger/sprint.c
I src/usr.bin/finger/obj
C src/usr.bin/finger/net.c
C src/usr.bin/finger/lprint.c
C src/usr.bin/finger/finger.h
C src/usr.bin/finger/finger.c
C src/usr.bin/finger/finger.1
N src/usr.bin/finger/extern.h
C src/usr.bin/finger/util.c

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

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