sun-lamp CVS commits

[The Source of All Evil <source>]

glass
Sat Mar 25 23:10:25 EST 1995
Update of /a/cvsroot/src/usr.bin/checknr
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv23313

Modified Files:
        Makefile checknr.1 checknr.c 
Log Message:
merged with 4.4 lite

glass
Sat Mar 25 23:19:19 EST 1995
Update of /a/cvsroot/src/usr.bin/chpass
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv23517

Revision/Branch: 1.1.1

Log Message:
Import from 4.4Lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/usr.bin/chpass/util.c
C src/usr.bin/chpass/chpass.c
C src/usr.bin/chpass/chpass.h
C src/usr.bin/chpass/edit.c
C src/usr.bin/chpass/field.c
C src/usr.bin/chpass/Makefile
C src/usr.bin/chpass/pathnames.h
C src/usr.bin/chpass/pw_copy.c
N src/usr.bin/chpass/pw_copy.h
C src/usr.bin/chpass/table.c
C src/usr.bin/chpass/chpass.1

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

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