source-changes: sun-lamp CVS commits

Subject: sun-lamp CVS commits
To: None <source-changes@pain.lcs.mit.edu>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 11/15/1995 11:20:03

thorpej
Wed Nov 15 08:11:19 PST 1995
Update of /a/cvsroot/src/usr.bin/xargs
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv27711

Modified Files:
	pathnames.h 
Log Message:
Resolve CVS conflicts that appeared in a comment, and thus went unnoticed.
Pointed out to me by Niklas, who heard about it from Theo.


thorpej
Wed Nov 15 08:13:04 PST 1995
Update of /a/cvsroot/src/usr.bin/xargs
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv27749

Revision/Branch: netbsd-1-1

Modified Files:
	pathnames.h 
Log Message:
Update from trunk; fix CVS conflict.