Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: None <source@NetBSD.ORG>
List: source-changes
Date: 09/16/1997 16:50:06 
lukem
Tue Sep 16 09:45:42 PDT 1997
Update of /cvsroot/src/sbin/fsck_ffs
In directory netbsd1:/var/slash-tmp/cvs-serv8882

Modified Files:
	Makefile dir.c extern.h fsck.h inode.c main.c pass1.c pass1b.c 
	pass2.c pass3.c pass4.c pass5.c setup.c utilities.c 
Log Message:
resolve conflicts from lite-2 merge.