[Note from the mailing list owner]
[612KB is bit too big to be send out, so I removed 610KB of if]

Module Name:	xsrc
Committed By:	tron
Date:		Wed Sep  4 16:50:59 UTC 2002

Update of /cvsroot/xsrc/xfree/xc
In directory minbar.netbsd.org:/tmp/cvs-serv5110

Log Message:
Import of XFree86 4.2.1.


Vendor Tag:	XF86
Release Tags:	v4-2-1
		
U xsrc/xfree/xc/INSTALL-X.org
U xsrc/xfree/xc/Imakefile
U xsrc/xfree/xc/LABEL
U xsrc/xfree/xc/Makefile
U xsrc/xfree/xc/RELNOTES
U xsrc/xfree/xc/RELNOTES-X.org
U xsrc/xfree/xc/bug-report
U xsrc/xfree/xc/registry
C xsrc/xfree/xc/config/cf/FreeBSD.cf
C xsrc/xfree/xc/config/cf/Imake.tmpl
C xsrc/xfree/xc/config/cf/NetBSD.cf
C xsrc/xfree/xc/config/cf/OpenBSD.cf
C xsrc/xfree/xc/config/cf/X11.tmpl
C xsrc/xfree/xc/config/cf/linux.cf
C xsrc/xfree/xc/config/cf/sun.cf
C xsrc/xfree/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c
C xsrc/xfree/xc/lib/X11/Imakefile
C xsrc/xfree/xc/lib/X11/XlcDL.c
C xsrc/xfree/xc/lib/X11/lcFile.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/CHANGELOG
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86Version.h
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c
C xsrc/xfree/xc/programs/scripts/xon.sh
C xsrc/xfree/xc/programs/xinit/startx.cpp
C xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc

22 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jXF86:yesterday -jXF86 xsrc/xfree/xc