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:50:02 
lukem
Tue Sep 16 06:44:18 PDT 1997
Update of /cvsroot/src/sbin/restore
In directory netbsd1:/var/slash-tmp/cvs-serv21005

Modified Files:
	dirs.c interactive.c main.c restore.8 symtab.c tape.c 
	utilities.c 
Log Message:
resolve conflicts from lite-2 merge