Module Name:	xsrc
Committed By:	tron
Date:		Wed Jan 20 10:10:31 UTC 1999

Modified Files:
	xsrc/xc/config/cf: FreeBSD.cf Imake.cf NetBSD.cf X11.tmpl
	xsrc/xc/config/imake: imakemdep.h
	xsrc/xc/programs/Xserver/hw/xfree68/doc: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86: xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: PCI.h Print.c Probe.h
	xsrc/xc/programs/Xserver/hw/xfree86/common: atKeynames.h xf86.h
	    xf86Config.c xf86Events.c xf86Kbd.c xf86_Mouse.c
	xsrc/xc/programs/Xserver/hw/xfree86/common_hw: xf86_PCI.c
	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/vga256/drivers/s3v: s3v_driver.c
	xsrc/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xc/programs/Xserver/include: servermd.h
	xsrc/xc/programs/Xserver/os: utils.c xalloc.c
	xsrc/xc/programs/xkbcomp/symbols: Imakefile
Log Message:
Resolv conflicts from XFree86 3.3.3.1 import.