Subject: CVS commit: src
To: None <source-changes@netbsd.org>
From: Simon Burge <simonb@netbsd.org>
List: source-changes
Date: 02/20/1999 03:34:29 
Module Name:	src
Committed By:	simonb
Date:		Sat Feb 20 11:34:29 UTC 1999

Modified Files:
	src/gnu/dist/grep/doc: grep.texi
	src/gnu/dist/grep/src: grep.c
Log Message:
Resolve conflicts from import.