Module Name:	xsrc
Committed By:	tron
Date:		Sat Jun  9 17:56:51 UTC 2001

Modified Files:
	xsrc/xfree/xc/doc: Imakefile
	xsrc/xfree/xc/lib/font/Type1: arith.c curves.c hints.c objects.c
	    objects.h paths.c regions.c spaces.c t1funcs.c t1malloc.c t1stub.c
	xsrc/xfree/xc/programs/Xserver/hw/sun: sunInit.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe: AsmMacros.h
	    Imakefile OS_386BSD.c PCI.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/common: compiler.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd: Imakefile
	    bsdResource.c bsd_jstk.c bsd_video.c
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus: Imakefile
	    Pci.h
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc: Imakefile
	xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xfree/xc/programs/xdm/config: xdm-conf.cpp
	xsrc/xfree/xc/programs/xterm: misc.c

Log Message:
Resolve conflicts from import of XFree86 4.1.0.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/doc/Imakefile
cvs rdiff -r1.3 -r1.4 xsrc/xfree/xc/lib/font/Type1/arith.c \
    xsrc/xfree/xc/lib/font/Type1/curves.c \
    xsrc/xfree/xc/lib/font/Type1/hints.c \
    xsrc/xfree/xc/lib/font/Type1/objects.c \
    xsrc/xfree/xc/lib/font/Type1/objects.h \
    xsrc/xfree/xc/lib/font/Type1/paths.c \
    xsrc/xfree/xc/lib/font/Type1/regions.c \
    xsrc/xfree/xc/lib/font/Type1/spaces.c \
    xsrc/xfree/xc/lib/font/Type1/t1funcs.c \
    xsrc/xfree/xc/lib/font/Type1/t1malloc.c \
    xsrc/xfree/xc/lib/font/Type1/t1stub.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/sun/sunInit.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/SuperProbe/PCI.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/common/compiler.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c
cvs rdiff -r1.4 -r1.5 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
cvs rdiff -r1.2 -r1.3 \
    xsrc/xfree/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xdm/config/xdm-conf.cpp
cvs rdiff -r1.2 -r1.3 xsrc/xfree/xc/programs/xterm/misc.c

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