Module Name:	xsrc
Committed By:	tron
Date:		Mon Mar  5 21:14:53 UTC 2001

Modified Files:
	xsrc/xc/config/cf: FreeBSD.cf Imake.rules NetBSD.cf xf86site.def
	    xfree86.cf
	xsrc/xc/config/imake: imake.c
	xsrc/xc/lib/ICE: process.c
	xsrc/xc/lib/X11: OpenDis.c XlibInt.c
	xsrc/xc/lib/Xaw: AsciiSrc.c MultiSrc.c
	xsrc/xc/lib/xtrans: Xtrans.c Xtranssock.c
	xsrc/xc/programs/Xserver: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86: XF86Conf.man xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: OS_386BSD.c
	xsrc/xc/programs/Xserver/hw/xfree86/common: xf86Events.c xf86KbdBSD.c
	    xf86_Mouse.c
	xsrc/xc/programs/Xserver/hw/xfree86/etc: apNetBSD.shar
	xsrc/xc/programs/Xserver/hw/xfree86/os-support: xf86_OSlib.h
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/bsd: bsd_init.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/dgux: bios_DGmmap.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/lynxos: lynx_mmap.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/solx86: solx86_mmap.c
	xsrc/xc/programs/Xserver/hw/xfree86/os-support/sysv: bios_V4mmap.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/r128: r128_accel.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga: vga.h vgaPCI.h
	xsrc/xc/programs/Xserver/hw/xfree86/xf86config: xf86config.c
	xsrc/xc/programs/twm: system.twmrc
	xsrc/xc/programs/xauth: process.c
	xsrc/xc/programs/xdm: Imakefile session.c
	xsrc/xc/programs/xkbcomp/symbols: Imakefile
	xsrc/xc/programs/xterm: main.c scrollbar.c xterm.h

Log Message:
Resolv conflicts from last import.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 xsrc/xc/config/cf/FreeBSD.cf
cvs rdiff -r1.4 -r1.5 xsrc/xc/config/cf/Imake.rules
cvs rdiff -r1.84 -r1.85 xsrc/xc/config/cf/NetBSD.cf
cvs rdiff -r1.20 -r1.21 xsrc/xc/config/cf/xf86site.def
cvs rdiff -r1.12 -r1.13 xsrc/xc/config/cf/xfree86.cf
cvs rdiff -r1.11 -r1.12 xsrc/xc/config/imake/imake.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/ICE/process.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/X11/OpenDis.c
cvs rdiff -r1.4 -r1.5 xsrc/xc/lib/X11/XlibInt.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/Xaw/AsciiSrc.c xsrc/xc/lib/Xaw/MultiSrc.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/lib/xtrans/Xtrans.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/lib/xtrans/Xtranssock.c
cvs rdiff -r1.25 -r1.26 xsrc/xc/programs/Xserver/Imakefile
cvs rdiff -r1.6 -r1.7 xsrc/xc/programs/Xserver/hw/xfree86/XF86Conf.man
cvs rdiff -r1.8 -r1.9 xsrc/xc/programs/Xserver/hw/xfree86/xf86Version.h
cvs rdiff -r1.8 -r1.9 \
    xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
cvs rdiff -r1.15 -r1.16 \
    xsrc/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar
cvs rdiff -r1.7 -r1.8 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/dgux/bios_DGmmap.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c
cvs rdiff -r1.3 -r1.4 \
    xsrc/xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c
cvs rdiff -r1.2 -r1.3 \
    xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/r128/r128_accel.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h
cvs rdiff -r1.7 -r1.8 xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaPCI.h
cvs rdiff -r1.7 -r1.8 \
    xsrc/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/twm/system.twmrc
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xauth/process.c
cvs rdiff -r1.3 -r1.4 xsrc/xc/programs/xdm/Imakefile
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/xdm/session.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/xkbcomp/symbols/Imakefile
cvs rdiff -r1.2 -r1.3 xsrc/xc/programs/xterm/main.c
cvs rdiff -r1.5 -r1.6 xsrc/xc/programs/xterm/scrollbar.c
cvs rdiff -r1.8 -r1.9 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.