source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 03/08/1998 04:20:02

veego
Sun Mar  8 04:12:23 PST 1998
Update of /cvsroot/xsrc/xc/config/imake
In directory nb00:/tmp/cvs-serv23110

Modified Files:
	imake.c 
Log Message:
Resolve conflicts from the import of XFree86 3.3.2.


veego
Sun Mar  8 04:17:31 PST 1998
Update of /cvsroot/xsrc/xc/config/cf
In directory nb00:/tmp/cvs-serv23187

Modified Files:
	xf86site.def 
Log Message:
Resolve conflicts from the import of XFree86 3.3.2.