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:35:58

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

Modified Files:
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: compiler.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd: Imakefile
	    bsdResource.c bsd_jstk.c bsd_video.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus: Imakefile
	    Pci.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc: Imakefile

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/common/compiler.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile

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