Module Name:	xsrc
Committed By:	tron
Date:		Fri Feb 28 21:49:52 UTC 2003

Modified Files:
	xsrc/xfree/xc/config/cf: FreeBSD.cf Imake.cf Imake.rules Imake.tmpl
	    NetBSD.cf OpenBSD.cf X11.tmpl bsdLib.rules bsdLib.tmpl linux.cf
	    sun.cf xfree86.cf
	xsrc/xfree/xc/config/imake: imakemdep.h
	xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess:
	    quicksort.cc
	xsrc/xfree/xc/extras/x86emu/src/x86emu: decode.c
	xsrc/xfree/xc/include: Xmd.h
	xsrc/xfree/xc/include/DPS: dpsfriends.h
	xsrc/xfree/xc/lib/X11: Imakefile XlcDL.c imDefIm.c lcFile.c
	xsrc/xfree/xc/lib/Xaw: MultiSrc.c
	xsrc/xfree/xc/lib/Xt: Xtos.h
	xsrc/xfree/xc/lib/Xxf86dga: XF86DGA.c XF86DGA2.c
	xsrc/xfree/xc/lib/font/Type1: arith.c curves.c hints.c objects.c
	    objects.h paths.c regions.c spaces.c t1funcs.c t1malloc.c t1stub.c
	xsrc/xfree/xc/nls: compose.dir locale.dir
	xsrc/xfree/xc/nls/XI18N_OBJS: Imakefile
	xsrc/xfree/xc/programs/Xserver/Xext: shm.c
	xsrc/xfree/xc/programs/Xserver/hw/sun: sunInit.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86: CHANGELOG
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: Imakefile compiler.h
	    xf86Bus.c xf86Config.c xf86Events.c xf86Io.c xf86KbdBSD.c
	    xf86Mode.c xf86PciInfo.h xf86pciBus.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/doc/sgml: RELNOTES.sgml
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati: aticonfig.c
	    atilock.c r128.h r128_video.c radeon_driver.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/i128: i128_driver.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/i810: i810_driver.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga: mga.h mga.man
	    mga_dacG.c mga_dri.c mga_driver.c mga_g450pll.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic: Imakefile
	    neo.h neo_2070.c neo_2090.c neo_2097.c neo_2200.c neo_dga.c
	    neo_driver.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv: nv_cursor.c
	    nv_dac.c nv_driver.c nv_proto.h nv_setup.c nv_type.h riva_hw.c
	    riva_hw.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident:
	    trident_driver.c trident_video.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware: vmware.c
	    vmware.h vmwarecurs.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/etc: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/loader: loader.c xf86sym.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd: Imakefile
	    bsdResource.c bsd_io.c bsd_jstk.c bsd_mouse.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus: Imakefile
	    Pci.h xf86Sbus.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/linux: lnx_agp.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/vgahw: vgaHW.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xfree/xc/programs/Xserver/include: os.h servermd.h
	xsrc/xfree/xc/programs/Xserver/mfb: maskbits.h
	xsrc/xfree/xc/programs/Xserver/os: Imakefile access.c xalloc.c
	xsrc/xfree/xc/programs/Xserver/render: miindex.c
	xsrc/xfree/xc/programs/scripts: xon.sh
	xsrc/xfree/xc/programs/twm: add_window.c
	xsrc/xfree/xc/programs/xdm: Imakefile dm.h genauth.c
	xsrc/xfree/xc/programs/xdm/config: xdm-conf.cpp
	xsrc/xfree/xc/programs/xinit: startx.cpp
	xsrc/xfree/xc/programs/xkbcomp/rules: xfree86
	xsrc/xfree/xc/programs/xkbcomp/symbols/macintosh: us
	xsrc/xfree/xc/programs/xterm: Imakefile charproc.c main.c misc.c ptyx.h
	    version.h xterm.h
Added Files:
	xsrc/xfree/xc/lib/GL/mesa/src/X: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/sis: init301.c
	    init301.h initdef.h sis_driver.h

Log Message:
Resolve conflicts from import of XFree86 4.3.0.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/config/cf/FreeBSD.cf \
    xsrc/xfree/xc/config/cf/OpenBSD.cf xsrc/xfree/xc/config/cf/bsdLib.rules \
    xsrc/xfree/xc/config/cf/bsdLib.tmpl
cvs rdiff -r1.7 -r1.8 xsrc/xfree/xc/config/cf/Imake.cf
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/config/cf/Imake.rules \
    xsrc/xfree/xc/config/cf/X11.tmpl xsrc/xfree/xc/config/cf/linux.cf
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/config/cf/Imake.tmpl
cvs rdiff -r1.41 -r1.42 xsrc/xfree/xc/config/cf/NetBSD.cf
cvs rdiff -r1.6 -r1.7 xsrc/xfree/xc/config/cf/sun.cf \
    xsrc/xfree/xc/config/cf/xfree86.cf
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/config/imake/imakemdep.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/extras/x86emu/src/x86emu/decode.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/include/Xmd.h
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/include/DPS/dpsfriends.h
cvs rdiff -r0 -r1.3 xsrc/xfree/xc/lib/GL/mesa/src/X/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/lib/X11/Imakefile \
    xsrc/xfree/xc/lib/X11/lcFile.c
cvs rdiff -r1.7 -r1.8 xsrc/xfree/xc/lib/X11/XlcDL.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/lib/X11/imDefIm.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/lib/Xaw/MultiSrc.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/lib/Xt/Xtos.h
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/lib/Xxf86dga/XF86DGA.c \
    xsrc/xfree/xc/lib/Xxf86dga/XF86DGA2.c
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/lib/font/Type1/arith.c \
    xsrc/xfree/xc/lib/font/Type1/objects.c \
    xsrc/xfree/xc/lib/font/Type1/t1stub.c
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/lib/font/Type1/curves.c \
    xsrc/xfree/xc/lib/font/Type1/hints.c \
    xsrc/xfree/xc/lib/font/Type1/objects.h \
    xsrc/xfree/xc/lib/font/Type1/paths.c \
    xsrc/xfree/xc/lib/font/Type1/regions.c \
    xsrc/xfree/xc/lib/font/Type1/spaces.c \
    xsrc/xfree/xc/lib/font/Type1/t1funcs.c \
    xsrc/xfree/xc/lib/font/Type1/t1malloc.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/nls/compose.dir \
    xsrc/xfree/xc/nls/locale.dir
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/nls/XI18N_OBJS/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/Xext/shm.c
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/programs/Xserver/hw/sun/sunInit.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/hw/xfree86/CHANGELOG
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Bus.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Config.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Events.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Io.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
cvs rdiff -r1.8 -r1.9 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/compiler.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
cvs rdiff -r1.6 -r1.7 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/r128.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dacG.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_g450pll.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2070.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2090.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2097.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
cvs rdiff -r0 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/sis/initdef.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.h
cvs rdiff -r1.5 -r1.6 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/xfree86/etc/Imakefile
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/loader/loader.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c
cvs rdiff -r1.6 -r1.7 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.10 -r1.11 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
cvs rdiff -r1.5 -r1.6 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c
cvs rdiff -r1.8 -r1.9 \
    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/bus/xf86Sbus.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c
cvs rdiff -r1.5 -r1.6 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/Xserver/include/servermd.h
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/mfb/maskbits.h
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/os/Imakefile \
    xsrc/xfree/xc/programs/Xserver/os/access.c \
    xsrc/xfree/xc/programs/Xserver/os/xalloc.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/render/miindex.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/scripts/xon.sh
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/twm/add_window.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xdm/Imakefile \
    xsrc/xfree/xc/programs/xdm/genauth.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xdm/dm.h
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/xdm/config/xdm-conf.cpp
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xinit/startx.cpp
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xkbcomp/rules/xfree86
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xkbcomp/symbols/macintosh/us
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xterm/Imakefile \
    xsrc/xfree/xc/programs/xterm/charproc.c \
    xsrc/xfree/xc/programs/xterm/ptyx.h \
    xsrc/xfree/xc/programs/xterm/version.h \
    xsrc/xfree/xc/programs/xterm/xterm.h
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/xterm/main.c
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/programs/xterm/misc.c

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