sun-lamp CVS commits

[The Source of All Evil <source>]

tls
Mon Sep  4 11:41:13 EDT 1995
Update of /a/cvsroot/src/usr.bin/apropos
In directory pain.lcs.mit.edu:/a/os/4.4BSD-Lite2/usr/src/usr.bin/apropos

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/usr.bin/apropos/apropos.1
U src/usr.bin/apropos/Makefile
I src/usr.bin/apropos/obj
cvs: ERROR: Check-in of /a/cvsroot/src/usr.bin/apropos/apropos.c,v failed
I src/usr.bin/apropos/tags

No conflicts created by this import


tls
Mon Sep  4 11:41:48 EDT 1995
Update of /a/cvsroot/src/usr.bin/apropos
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
I src/usr.bin/apropos/tags
I src/usr.bin/apropos/obj
C src/usr.bin/apropos/apropos.c
U src/usr.bin/apropos/apropos.1
U src/usr.bin/apropos/Makefile

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

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