sun-lamp CVS commits

[The Source of All Evil <source>]

glass
Tue Mar 28 11:50:14 EST 1995
Update of /a/cvsroot/src/usr.bin/dirname
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv16922

Modified Files:
        Makefile dirname.c 
Log Message:
Merged with 4.4Lite

glass
Tue Mar 28 11:52:31 EST 1995
Update of /a/cvsroot/src/usr.bin/du
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv16984

Revision/Branch: 1.1.1

Log Message:
Import from 4.4

Status:

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

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

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