Module Name:	xsrc
Committed By:	tron
Date:		Mon Jan 10 23:50:37 UTC 2000

Modified Files:
	xsrc/xc/config/cf: FreeBSD.cf NetBSD.cf bsdLib.tmpl sun.cf xf86site.def
	    xfree86.cf
	xsrc/xc/config/imake: imake.c imakemdep.h
	xsrc/xc/include/extensions: xf86misc.h
	xsrc/xc/programs/Xserver: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86: XF86Conf.man xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: PCI.h Print.c Probe.h
	    S3.c
	xsrc/xc/programs/Xserver/hw/xfree86/XF86Setup: mouse.tcl mseproto.cpp
	    tclmisc.c tclxfconf.c
	xsrc/xc/programs/Xserver/hw/xfree86/common: Imakefile xf86.h
	    xf86Events.c xf86_Config.h xf86_Mouse.c
	xsrc/xc/programs/Xserver/hw/xfree86/etc: scanpci.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips: ct_driver.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/mga: mga_driver.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v: regs3v.h
	    s3v_cursor.c s3v_driver.c s3v_misc.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga: vgaPCI.h
	xsrc/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xc/programs/xdm: Imakefile session.c
	xsrc/xc/programs/xdm/config: xdm-conf.cpp
	xsrc/xc/programs/xdpyinfo: xdpyinfo.c

Log Message:
Resolve conflicts from import of XFree86 3.3.6.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 xsrc/xc/config/cf/FreeBSD.cf
cvs rdiff -r1.62 -r1.63 xsrc/xc/config/cf/NetBSD.cf
cvs rdiff -r1.4 -r1.5 xsrc/xc/config/cf/bsdLib.tmpl
cvs rdiff -r1.3 -r1.4 xsrc/xc/config/cf/sun.cf
cvs rdiff -r1.16 -r1.17 xsrc/xc/config/cf/xf86site.def
cvs rdiff -r1.10 -r1.11 xsrc/xc/config/cf/xfree86.cf
cvs rdiff -r1.10 -r1.11 xsrc/xc/config/imake/imake.c
cvs rdiff -r1.7 -r1.8 xsrc/xc/config/imake/imakemdep.h
cvs rdiff -r1.4 -r1.5 xsrc/xc/include/extensions/xf86misc.h
cvs rdiff -r1.20 -r1.21 xsrc/xc/programs/Xserver/Imakefile
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/XF86Conf.man
cvs rdiff -r1.6 -r1.7 xsrc/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.6 -r1.7 xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.h \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/Print.c \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/Probe.h
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl \
    xsrc/xc/programs/Xserver/hw/xfree86/XF86Setup/mseproto.cpp \
    xsrc/xc/programs/Xserver/hw/xfree86/XF86Setup/tclmisc.c \
    xsrc/xc/programs/Xserver/hw/xfree86/XF86Setup/tclxfconf.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/common/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86.h
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
cvs rdiff -r1.9 -r1.10 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
cvs rdiff -r1.14 -r1.15 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
cvs rdiff -r1.7 -r1.8 xsrc/xc/programs/Xserver/hw/xfree86/etc/scanpci.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.6 -r1.7 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/mga/mga_driver.c
cvs rdiff -r1.5 -r1.6 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/regs3v.h \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_misc.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_cursor.c
cvs rdiff -r1.6 -r1.7 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_driver.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h
cvs rdiff -r1.6 -r1.7 \
    xsrc/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xdm/Imakefile
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/xdm/session.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xdm/config/xdm-conf.cpp
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/xdpyinfo/xdpyinfo.c

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