source-changes: CVS commit: xsrc

Subject: CVS commit: xsrc
To: None <source-changes@netbsd.org>
From: Matthias Scheler <tron@netbsd.org>
List: source-changes
Date: 06/09/2001 20:47:28

Module Name:	xsrc
Committed By:	tron
Date:		Sat Jun  9 17:47:28 UTC 2001

Modified Files:
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: xf86PciInfo.h

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.