NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

lukem
Mon Sep 15 19:22:00 PDT 1997
Update of /cvsroot/src/sbin/clri
In directory netbsd1:/var/slash-tmp/cvs-serv17907

Log Message:
imported from lite-2

Status:

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

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/clri


lukem
Mon Sep 15 19:23:28 PDT 1997
Update of /cvsroot/src/sbin/disklabel
In directory netbsd1:/var/slash-tmp/cvs-serv18052

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/sbin/disklabel/disklabel.c
U src/sbin/disklabel/Makefile
U src/sbin/disklabel/disklabel.8
U src/sbin/disklabel/pathnames.h
C src/sbin/disklabel/disklabel.5.5
U src/sbin/disklabel/dkcksum.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/disklabel


lukem
Mon Sep 15 19:24:19 PDT 1997
Update of /cvsroot/src/sbin/dmesg
In directory netbsd1:/var/slash-tmp/cvs-serv18219

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/sbin/dmesg/Makefile
U src/sbin/dmesg/dmesg.8
U src/sbin/dmesg/dmesg.c

No conflicts created by this import


lukem
Mon Sep 15 19:25:37 PDT 1997
Update of /cvsroot/src/sbin/dump
In directory netbsd1:/var/slash-tmp/cvs-serv18313

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/sbin/dump/dump.h
U src/sbin/dump/itime.c
C src/sbin/dump/main.c
C src/sbin/dump/unctime.c
U src/sbin/dump/optr.c
C src/sbin/dump/dump.8
U src/sbin/dump/Makefile
C src/sbin/dump/dumprmt.c
C src/sbin/dump/tape.c
C src/sbin/dump/traverse.c
U src/sbin/dump/pathnames.h

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/dump


lukem
Mon Sep 15 19:26:12 PDT 1997
Update of /cvsroot/src/usr.sbin/dumpfs
In directory netbsd1:/var/slash-tmp/cvs-serv18441

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Mon Sep 15 19:27:00 PDT 1997
Update of /cvsroot/src/usr.sbin/dumplfs
In directory netbsd1:/var/slash-tmp/cvs-serv18548

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/usr.sbin/dumplfs/dumplfs.c
C src/usr.sbin/dumplfs/extern.h
C src/usr.sbin/dumplfs/misc.c
U src/usr.sbin/dumplfs/Makefile
U src/usr.sbin/dumplfs/dumplfs.8

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

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