Module Name:	xsrc
Committed By:	tron
Date:		Wed Sep  4 20:38:58 UTC 2002

Modified Files:
	xsrc/xfree/xc/config/cf: FreeBSD.cf Imake.tmpl NetBSD.cf OpenBSD.cf
	    X11.tmpl linux.cf sun.cf
	xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess:
	    quicksort.cc
	xsrc/xfree/xc/lib/X11: Imakefile XlcDL.c lcFile.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86: CHANGELOG xf86Version.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/doc/sgml: RELNOTES.sgml

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/config/cf/FreeBSD.cf \
    xsrc/xfree/xc/config/cf/OpenBSD.cf xsrc/xfree/xc/config/cf/X11.tmpl \
    xsrc/xfree/xc/config/cf/linux.cf
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/config/cf/Imake.tmpl
cvs rdiff -r1.32 -r1.33 xsrc/xfree/xc/config/cf/NetBSD.cf
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/config/cf/sun.cf
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/lib/X11/Imakefile \
    xsrc/xfree/xc/lib/X11/lcFile.c
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/lib/X11/XlcDL.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/xfree86/CHANGELOG \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml

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