Module Name:	xsrc
Committed By:	tron
Date:		Fri Dec 19 13:03:48 UTC 2003

Modified Files:
	xsrc/xfree/xc/config/cf: NetBSD.cf OpenBSD.cf X11.tmpl linux.cf sun.cf
	    xfree86.cf
	xsrc/xfree/xc/lib/X11: XlcDL.c imDefIm.c lcFile.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86: CHANGELOG xf86Version.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: Imakefile xf86Mode.c
	    xf86pciBus.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati: radeon_driver.c
	    radeon_reg.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv: nv_setup.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/siliconmotion:
	    smi_video.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/loader: xf86sym.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus: Pci.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/shared:
	    libc_wrapper.c
	xsrc/xfree/xc/programs/Xserver/os: access.c
	xsrc/xfree/xc/programs/Xserver/xkb: xkbInit.c
	xsrc/xfree/xc/programs/mkfontscale: mkfontscale.c
	xsrc/xfree/xc/programs/twm: menus.c
	xsrc/xfree/xc/programs/xdm: Imakefile dm.h genauth.c

Log Message:
Resolve conflicts from import of 2003-12-19 sources.


To generate a diff of this commit:
cvs rdiff -r1.57 -r1.58 xsrc/xfree/xc/config/cf/NetBSD.cf
cvs rdiff -r1.5 -r1.6 xsrc/xfree/xc/config/cf/OpenBSD.cf
cvs rdiff -r1.6 -r1.7 xsrc/xfree/xc/config/cf/X11.tmpl
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/config/cf/linux.cf
cvs rdiff -r1.7 -r1.8 xsrc/xfree/xc/config/cf/sun.cf
cvs rdiff -r1.10 -r1.11 xsrc/xfree/xc/config/cf/xfree86.cf
cvs rdiff -r1.8 -r1.9 xsrc/xfree/xc/lib/X11/XlcDL.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/lib/X11/imDefIm.c
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/lib/X11/lcFile.c
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/Xserver/hw/xfree86/CHANGELOG \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.7 -r1.8 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/Imakefile
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c
cvs rdiff -r1.7 -r1.8 \
    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/bus/Pci.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/os/access.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/xkb/xkbInit.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/mkfontscale/mkfontscale.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/twm/menus.c
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/programs/xdm/Imakefile \
    xsrc/xfree/xc/programs/xdm/genauth.c
cvs rdiff -r1.4 -r1.5 xsrc/xfree/xc/programs/xdm/dm.h

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