lukem
Tue Sep 16 05:40:15 PDT 1997
Update of /cvsroot/src/usr.sbin/quotacheck
In directory netbsd1:/var/slash-tmp/cvs-serv15763

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Tue Sep 16 05:41:35 PDT 1997
Update of /cvsroot/src/sbin/ping
In directory netbsd1:/var/slash-tmp/cvs-serv15950

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Tue Sep 16 05:42:29 PDT 1997
Update of /cvsroot/src/sbin/restore
In directory netbsd1:/var/slash-tmp/cvs-serv16026

Log Message:
imported from lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/sbin/restore/dirs.c
C src/sbin/restore/main.c
U src/sbin/restore/Makefile
U src/sbin/restore/extern.h
U src/sbin/restore/pathnames.h
C src/sbin/restore/symtab.c
C src/sbin/restore/restore.h
C src/sbin/restore/restore.c
C src/sbin/restore/restore.8
C src/sbin/restore/interactive.c
C src/sbin/restore/tape.c
C src/sbin/restore/utilities.c

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

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


lukem
Tue Sep 16 05:43:37 PDT 1997
Update of /cvsroot/src/sbin/savecore
In directory netbsd1:/var/slash-tmp/cvs-serv16216

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Tue Sep 16 05:45:44 PDT 1997
Update of /cvsroot/src/sbin/shutdown
In directory netbsd1:/var/slash-tmp/cvs-serv16401

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Tue Sep 16 05:46:13 PDT 1997
Update of /cvsroot/src/sbin/slattach
In directory netbsd1:/var/slash-tmp/cvs-serv16435

Log Message:
imported from lite-2

Status:

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

No conflicts created by this import


lukem
Tue Sep 16 05:47:41 PDT 1997
Update of /cvsroot/src/sbin/tunefs
In directory netbsd1:/var/slash-tmp/cvs-serv16491

Log Message:
imported from lite-2

Status:

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

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

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