source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 09/16/1997 13:00:02

lukem
Tue Sep 16 05:54:44 PDT 1997
Update of /cvsroot/src/sbin/tunefs
In directory netbsd1:/var/slash-tmp/cvs-serv17106

Modified Files:
	tunefs.8 tunefs.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:57:46 PDT 1997
Update of /cvsroot/src/sbin/shutdown
In directory netbsd1:/var/slash-tmp/cvs-serv17548

Modified Files:
	shutdown.8 shutdown.c 
Log Message:
resolve conflicts from lite-2 merge