sun-lamp CVS commits

[The Source of All Evil <source>]

jtc
Sat Sep  2 02:00:54 EDT 1995
Update of /a/cvsroot/src/usr.bin/dirname
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

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

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

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


jtc
Sat Sep  2 02:02:34 EDT 1995
Update of /a/cvsroot/src/usr.bin/dirname
In directory pain.lcs.mit.edu:/a/users/jtc/cut/dirname

Modified Files:
        dirname.c 
Log Message:
Sync with 4.4lite2

jtc
Sat Sep  2 02:04:15 EDT 1995
Update of /a/cvsroot/src/usr.bin/error
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/usr.bin/error/Makefile
I src/usr.bin/error/tags
C src/usr.bin/error/subr.c
C src/usr.bin/error/pi.c
C src/usr.bin/error/pathnames.h
I src/usr.bin/error/obj
C src/usr.bin/error/main.c
C src/usr.bin/error/input.c
C src/usr.bin/error/filter.c
C src/usr.bin/error/error.h
C src/usr.bin/error/error.1
C src/usr.bin/error/touch.c

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

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


thorpej
Fri Sep  1 23:07:39 PDT 1995
Update of /a/cvsroot/doc
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv8204

Modified Files:
        CHANGES 
Log Message:
Note new hp300 network boot code, and fix typo in a previous entry.