sun-lamp CVS commits

[The Source of All Evil <source>]

glass
Sun Mar 26 00:21:07 EST 1995
Update of /a/cvsroot/src/usr.bin/col
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv24161

Revision/Branch: 1.1.1

Log Message:
import from 4.4Lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/usr.bin/col/col.1
C src/usr.bin/col/col.c
C src/usr.bin/col/Makefile
U src/usr.bin/col/README

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

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


glass
Sun Mar 26 00:25:55 EST 1995
Update of /a/cvsroot/src/usr.bin/col
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv24255

Modified Files:
        Makefile col.1 col.c 
Log Message:
merged with 4.4Lite

glass
Sun Mar 26 00:27:44 EST 1995
Update of /a/cvsroot/src/usr.bin/colcrt
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv24296

Revision/Branch: 1.1.1

Log Message:
Import from 4.4Lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/usr.bin/colcrt/colcrt.1
C src/usr.bin/colcrt/colcrt.c
C src/usr.bin/colcrt/Makefile

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

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