Module Name:	xsrc
Committed By:	tron
Date:		Wed Sep  1 21:00:20 UTC 1999

Modified Files:
	xsrc/xc/config/cf: Imake.cf xf86site.def xfree86.cf
	xsrc/xc/config/imake: imake.c imakemdep.h
	xsrc/xc/lib/X11: Imakefile XlibInt.c
	xsrc/xc/lib/Xmu: EditresCom.c
	xsrc/xc/lib/font/fontfile: fontfile.c
	xsrc/xc/lib/xtrans: Xtransint.h Xtranssock.c
	xsrc/xc/programs/Xserver: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86: XF86Conf.man xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: Imakefile OS_386BSD.c
	    PCI.h Print.c Probe.h S3.c
	xsrc/xc/programs/Xserver/hw/xfree86/common: compiler.h xf86Config.c
	    xf86Events.c xf86Io.c xf86Kbd.c xf86_Mouse.c
	xsrc/xc/programs/Xserver/hw/xfree86/common_hw: SlowBcopy.c
	xsrc/xc/programs/Xserver/hw/xfree86/etc: scanpci.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support: Imakefile xf86_OSlib.h
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/shared: std_mseEv.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v: regs3v.h
	    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/Xserver/include: servermd.h
	xsrc/xc/programs/Xserver/os: access.c utils.c
	xsrc/xc/programs/xdm: session.c
	xsrc/xc/programs/xkbcomp/symbols: Imakefile
	xsrc/xc/programs/xsm: xsm.c
	xsrc/xc/programs/xterm: xterm.h
Removed Files:
	xsrc/xc/programs/Xserver/hw/xfree86/accel/glint: README

Log Message:
Resolve conflicts from import of XFree86 3.3.5.


To generate a diff of this commit:
cvs rdiff -r1.16 -r1.17 xsrc/xc/config/cf/Imake.cf
cvs rdiff -r1.14 -r1.15 xsrc/xc/config/cf/xf86site.def
cvs rdiff -r1.8 -r1.9 xsrc/xc/config/cf/xfree86.cf
cvs rdiff -r1.9 -r1.10 xsrc/xc/config/imake/imake.c
cvs rdiff -r1.6 -r1.7 xsrc/xc/config/imake/imakemdep.h
cvs rdiff -r1.3 -r1.4 xsrc/xc/lib/X11/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/X11/XlibInt.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/Xmu/EditresCom.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/font/fontfile/fontfile.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/lib/xtrans/Xtransint.h \
    xsrc/xc/lib/xtrans/Xtranssock.c
cvs rdiff -r1.19 -r1.20 xsrc/xc/programs/Xserver/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/XF86Conf.man
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c
cvs rdiff -r1.5 -r1.6 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.1.1.1 -r0 \
    xsrc/xc/programs/Xserver/hw/xfree86/accel/glint/README
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/common/compiler.h \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Io.c
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c
cvs rdiff -r1.13 -r1.14 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/common_hw/SlowBcopy.c
cvs rdiff -r1.6 -r1.7 xsrc/xc/programs/Xserver/hw/xfree86/etc/scanpci.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.5 -r1.6 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c
cvs rdiff -r1.5 -r1.6 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
cvs rdiff -r1.4 -r1.5 \
    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.5 -r1.6 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_driver.c
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h
cvs rdiff -r1.5 -r1.6 \
    xsrc/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.9 -r1.10 xsrc/xc/programs/Xserver/include/servermd.h
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/os/access.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/os/utils.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/xdm/session.c
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/xkbcomp/symbols/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xsm/xsm.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/xterm/xterm.h

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