sun-lamp CVS commits

[The Source Master <srcmastr%NetBSD.ORG@localhost>]

jtc
Thu Dec 22 13:08:45 PST 1994
Update of /b/source/CVS/src/usr.bin/look
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/look/Makefile
C src/usr.bin/look/look.1
C src/usr.bin/look/look.c
I src/usr.bin/look/obj
C src/usr.bin/look/pathnames.h
I src/usr.bin/look/tags

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

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


jtc
Thu Dec 22 13:09:02 PST 1994
Update of /b/source/CVS/src/usr.bin/lorder
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/lorder/Makefile
C src/usr.bin/lorder/lorder.1
U src/usr.bin/lorder/lorder.sh
I src/usr.bin/lorder/obj

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

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