source-changes: CVS commit: xsrc

Subject: CVS commit: xsrc
To: None <source-changes@netbsd.org>
From: Bernd Ernesti <veego@netbsd.org>
List: source-changes
Date: 03/18/2001 21:29:29

Module Name:	xsrc
Committed By:	veego
Date:		Sun Mar 18 19:29:29 UTC 2001

Modified Files:
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe: AsmMacros.h
	    Imakefile OS_386BSD.c PCI.c

Log Message:
Resolve conflicts of the import of XFree86 4.0.3.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.c

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