sun-lamp CVS commits

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

jtc
Wed Nov 30 00:32:29 PST 1994
Update of /b/source/CVS/src/share/man/man1
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/share/man/man1/Makefile
N src/share/man/man1/cd.1
C src/share/man/man1/intro.1
N src/share/man/man1/wait.1

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

        cvs checkout -jCSRG:yesterday -jCSRG src/share/man/man1


jtc
Wed Nov 30 00:35:05 PST 1994
Update of /b/source/CVS/src/share/man/man1
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/man1

Modified Files:
        Makefile cd.1 intro.1 wait.1 
Log Message:
Merged with 4.4lite
Changed to conform to NetBSD's new RCS Id convention.


jtc
Wed Nov 30 00:36:49 PST 1994
Update of /b/source/CVS/src/share/man/man3
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/share/man/man3/Makefile
C src/share/man/man3/assert.3
C src/share/man/man3/bitstring.3
C src/share/man/man3/end.3
C src/share/man/man3/intro.3
C src/share/man/man3/queue.3
C src/share/man/man3/stdarg.3

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

        cvs checkout -jCSRG:yesterday -jCSRG src/share/man/man3