NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

mrg
Thu Oct 16 22:00:47 PDT 1997
Update of /cvsroot/src/usr.sbin/mtree
In directory netbsd1:/home/mrg/lite2/mtree

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/usr.sbin/mtree/Makefile
U src/usr.sbin/mtree/compare.c
U src/usr.sbin/mtree/create.c
U src/usr.sbin/mtree/mtree.8
U src/usr.sbin/mtree/mtree.c
U src/usr.sbin/mtree/mtree.h
C src/usr.sbin/mtree/spec.c
U src/usr.sbin/mtree/extern.h
U src/usr.sbin/mtree/verify.c
U src/usr.sbin/mtree/misc.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/mtree


mrg
Thu Oct 16 22:02:45 PDT 1997
Update of /cvsroot/src/usr.sbin/portmap
In directory netbsd1:/home/mrg/lite2/portmap

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/usr.sbin/portmap/portmap.c
C src/usr.sbin/portmap/portmap.8
C src/usr.sbin/portmap/Makefile

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

        cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/portmap


mrg
Thu Oct 16 22:06:45 PDT 1997
Update of /cvsroot/src/usr.sbin/iostat
In directory netbsd1:/var/slash-tmp/cvs-serv28285

Modified Files:
        iostat.c 
Log Message:
merge lite-2