sun-lamp CVS commits

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

jtc
Sun Nov 13 21:02:24 PST 1994
Update of /b/source/CVS/src/usr.bin/who
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/who

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

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

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

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


jtc
Sun Nov 13 21:03:15 PST 1994
Update of /b/source/CVS/src/usr.bin/who
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp3

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

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

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

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


jtc
Sun Nov 13 21:03:52 PST 1994
Update of /b/source/CVS/src/usr.bin/whois
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp2

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

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

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

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