Module Name:	xsrc
Committed By:	tron
Date:		Tue Jul 20 23:37:16 UTC 1999

Modified Files:
	xsrc/xc/config/cf: FreeBSD.cf X11.rules bsdLib.rules sun.cf
	    xf86site.def xfree86.cf
	xsrc/xc/include/extensions: xf86misc.h
	xsrc/xc/lib/SM: sm_genid.c
	xsrc/xc/lib/xtrans: Xtransint.h Xtranslcl.c Xtranssock.c Xtransutil.c
	xsrc/xc/programs/Xserver: Imakefile
	xsrc/xc/programs/Xserver/Xext: xf86misc.c
	xsrc/xc/programs/Xserver/dix: events.c
	xsrc/xc/programs/Xserver/hw/xfree68: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree68/fbdev: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86: XF86Conf.man xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/LinkKit: site.def.LK
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: AsmMacros.h Imakefile
	    OS_386BSD.c 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/accel/s3: s3.c
	xsrc/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/newmmio: newmmio.c
	xsrc/xc/programs/Xserver/hw/xfree86/accel/s3_virge: s3.c
	xsrc/xc/programs/Xserver/hw/xfree86/common: xf86.h xf86Config.c
	    xf86_Config.h xf86_Mouse.c xf86_Option.h
	xsrc/xc/programs/Xserver/hw/xfree86/etc: scanpci.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support: xf86_OSlib.h
	xsrc/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked: mfblinebank.h
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv: 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: vga.c vgaPCI.h
	xsrc/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xc/programs/xdpyinfo: xdpyinfo.c
	xsrc/xc/programs/xkbcomp/geometry: Imakefile
	xsrc/xc/programs/xkbcomp/keycodes: Imakefile
	xsrc/xc/programs/xkbcomp/keymap: Imakefile
	xsrc/xc/programs/xkbcomp/symbols: Imakefile

Log Message:
Resolv conflicts from XFree86 3.3.4 import.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 xsrc/xc/config/cf/FreeBSD.cf
cvs rdiff -r1.6 -r1.7 xsrc/xc/config/cf/X11.rules \
    xsrc/xc/config/cf/xfree86.cf
cvs rdiff -r1.3 -r1.4 xsrc/xc/config/cf/bsdLib.rules
cvs rdiff -r1.2 -r1.3 xsrc/xc/config/cf/sun.cf
cvs rdiff -r1.13 -r1.14 xsrc/xc/config/cf/xf86site.def
cvs rdiff -r1.3 -r1.4 xsrc/xc/include/extensions/xf86misc.h
cvs rdiff -r1.3 -r1.4 xsrc/xc/lib/SM/sm_genid.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/xtrans/Xtransint.h \
    xsrc/xc/lib/xtrans/Xtranslcl.c xsrc/xc/lib/xtrans/Xtranssock.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/lib/xtrans/Xtransutil.c
cvs rdiff -r1.17 -r1.18 xsrc/xc/programs/Xserver/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/Xext/xf86misc.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/dix/events.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree68/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree68/fbdev/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/XF86Conf.man
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/LinkKit/site.def.LK
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/S3.c
cvs rdiff -r1.4 -r1.5 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.2 -r1.3 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.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/newmmio/newmmio.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/accel/s3_virge/s3.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86.h \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Option.h
cvs rdiff -r1.4 -r1.5 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
cvs rdiff -r1.8 -r1.9 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
cvs rdiff -r1.12 -r1.13 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/hw/xfree86/etc/scanpci.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfblinebank.h
cvs rdiff -r1.4 -r1.5 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv/Imakefile
cvs rdiff -r1.3 -r1.4 \
    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.4 -r1.5 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v/s3v_driver.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h
cvs rdiff -r1.4 -r1.5 \
    xsrc/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/xdpyinfo/xdpyinfo.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xkbcomp/geometry/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xkbcomp/keycodes/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xkbcomp/keymap/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/xkbcomp/symbols/Imakefile

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