Module Name:	xsrc
Committed By:	tron
Date:		Sat Jan 19 23:19:40 UTC 2002

Modified Files:
	xsrc/xfree/xc/config/cf: Imake.cf Imake.rules NetBSD.cf bsdLib.rules
	    bsdLib.tmpl sun.cf xfree86.cf
	xsrc/xfree/xc/include: Xmd.h
	xsrc/xfree/xc/lib/Xt: Xtos.h
	xsrc/xfree/xc/lib/Xxf86dga: XF86DGA.c XF86DGA2.c
	xsrc/xfree/xc/lib/font/Type1: curves.c hints.c objects.h paths.c
	    regions.c spaces.c t1funcs.c t1malloc.c
	xsrc/xfree/xc/programs/Xserver/XIE/mixie/process: bitfun.c
	xsrc/xfree/xc/programs/Xserver/cfb: cfbglblt8.c
	xsrc/xfree/xc/programs/Xserver/hw/sun: sunInit.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: compiler.h
	    xf86KbdBSD.c xf86PciInfo.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati: r128_video.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/nv: nv_const.h
	    nv_dac.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware: vmwareblt.c
	    vmwarecurs.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd: Imakefile
	    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/linux: lnx_agp.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc: Imakefile
	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: servermd.h
	xsrc/xfree/xc/programs/Xserver/mfb: mfbtegblt.c
	xsrc/xfree/xc/programs/twm: add_window.c
	xsrc/xfree/xc/programs/xdm: dm.h
	xsrc/xfree/xc/programs/xdm/config: xdm-conf.cpp
	xsrc/xfree/xc/programs/xkbcomp/keycodes: macintosh
	xsrc/xfree/xc/programs/xkbcomp/rules: xfree86
	xsrc/xfree/xc/programs/xkbcomp/symbols/macintosh: us
	xsrc/xfree/xc/programs/xman: misc.c
	xsrc/xfree/xc/programs/xterm: misc.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/config/cf/Imake.cf
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/config/cf/Imake.rules \
    xsrc/xfree/xc/config/cf/xfree86.cf
cvs rdiff -r1.21 -r1.22 xsrc/xfree/xc/config/cf/NetBSD.cf
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/config/cf/bsdLib.rules \
    xsrc/xfree/xc/config/cf/bsdLib.tmpl xsrc/xfree/xc/config/cf/sun.cf
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/include/Xmd.h
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/lib/Xt/Xtos.h
cvs rdiff -r1.2 -r1.3 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/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/programs/Xserver/XIE/mixie/process/bitfun.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/cfb/cfbglblt8.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/hw/sun/sunInit.c
cvs rdiff -r1.6 -r1.7 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/compiler.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c
cvs rdiff -r1.2 -r1.3 \
    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/nv/nv_const.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwareblt.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.6 -r1.7 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
cvs rdiff -r1.7 -r1.8 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
cvs rdiff -r1.4 -r1.5 \
    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/linux/lnx_agp.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/include/servermd.h
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/mfb/mfbtegblt.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/twm/add_window.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xdm/dm.h
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xdm/config/xdm-conf.cpp
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xkbcomp/keycodes/macintosh
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xkbcomp/rules/xfree86
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xkbcomp/symbols/macintosh/us
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xman/misc.c
cvs rdiff -r1.3 -r1.4 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.