Module Name:	xsrc
Committed By:	tron
Date:		Sat Jun  9 15:58:00 UTC 2001

Update of /cvsroot/xsrc/xfree
In directory netbsd.hut.fi:/tmp/cvs-serv13384

Log Message:
Import of XFree86 4.1.0.


Vendor Tag:	XF86
Release Tags:	v4-1-0
		
C xsrc/xfree/xc/config/cf/Imake.cf
C xsrc/xfree/xc/config/cf/NetBSD.cf
C xsrc/xfree/xc/config/cf/bsdLib.rules
C xsrc/xfree/xc/config/cf/bsdLib.tmpl
C xsrc/xfree/xc/config/cf/sun.cf
C xsrc/xfree/xc/lib/font/Type1/arith.c
C xsrc/xfree/xc/lib/font/Type1/curves.c
C xsrc/xfree/xc/lib/font/Type1/hints.c
C xsrc/xfree/xc/lib/font/Type1/objects.c
C xsrc/xfree/xc/lib/font/Type1/objects.h
C xsrc/xfree/xc/lib/font/Type1/paths.c
C xsrc/xfree/xc/lib/font/Type1/regions.c
C xsrc/xfree/xc/lib/font/Type1/spaces.c
C xsrc/xfree/xc/lib/font/Type1/t1funcs.c
C xsrc/xfree/xc/lib/font/Type1/t1malloc.c
C xsrc/xfree/xc/lib/font/Type1/t1stub.c
C xsrc/xfree/xc/programs/Xserver/hw/sun/sunInit.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/compiler.h
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
C xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
C xsrc/xfree/xc/programs/xdm/config/xdm-conf.cpp
C xsrc/xfree/xc/programs/xterm/misc.c
C xsrc/xfree/xc/doc/Imakefile

[512KB is too big for this list]

35 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jXF86:yesterday -jXF86 xsrc/xfree