Module Name:	xsrc
Committed By:	tron
Date:		Mon Nov 23 21:32:59 UTC 1998

Modified Files:
	xsrc/xc/config/cf: FreeBSD.cf Imake.cf Imake.rules NetBSD.cf X11.rules
	    X11.tmpl bsdLib.tmpl xf86site.def xfree86.cf
	xsrc/xc/config/imake: imake.c imake.man imakemdep.h
	xsrc/xc/include: Xosdefs.h
	xsrc/xc/lib/SM: sm_genid.c
	xsrc/xc/lib/X11: IMWrap.c Imakefile ParseCmd.c XKBCvt.c XKBGetMap.c
	    Ximint.h Xrm.c imRm.c imRmAttr.c lcCT.c lcDB.c lcWrap.c udcInf.c
	xsrc/xc/lib/Xaw: Scrollbar.c Text.c TextPop.c Viewport.c
	xsrc/xc/lib/Xt: Callback.c Convert.c Create.c GetResList.c Object.c
	    Resources.c
	xsrc/xc/lib/Xtst: XTest.c
	xsrc/xc/lib/font/Type1: spaces.c
	xsrc/xc/lib/font/fontfile: bufio.c
	xsrc/xc/lib/lbxutil/image: dfaxg42d.c dpackbits.c efaxg42d.c
	xsrc/xc/lib/lbxutil/lbx_zlib: lbx_zlib.c lbx_zlib_io.c
	xsrc/xc/programs/Xserver: Imakefile
	xsrc/xc/programs/Xserver/PEX5/ospex: osPexFont.c
	xsrc/xc/programs/Xserver/XIE/dixie/request: session.c
	xsrc/xc/programs/Xserver/Xext: mbuf.c xprint.c
	xsrc/xc/programs/Xserver/Xprint: Oid.c
	xsrc/xc/programs/Xserver/Xprint/pcl: Pcl.h PclGC.c PclWindow.c
	xsrc/xc/programs/Xserver/Xprint/ps: PsWindow.c psout.c
	xsrc/xc/programs/Xserver/cfb: cfb8line.c cfbmskbits.h
	xsrc/xc/programs/Xserver/dbe: dbe.c
	xsrc/xc/programs/Xserver/dix: dixfonts.c events.c main.c
	xsrc/xc/programs/Xserver/hw/sun: sunKeyMap.c
	xsrc/xc/programs/Xserver/hw/xfree86: xf86Version.h
	xsrc/xc/programs/Xserver/hw/xfree86/LinkKit: site.def.LK
	xsrc/xc/programs/Xserver/hw/xfree86/SuperProbe: PCI.h Print.c Probe.h
	xsrc/xc/programs/Xserver/hw/xfree86/accel/s3: s3.c
	xsrc/xc/programs/Xserver/hw/xfree86/accel/s3_virge: s3.c
	xsrc/xc/programs/Xserver/hw/xfree86/common: xf86Beta.c xf86Config.c
	    xf86_Config.h 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/bsd: bsd_init.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers: Imakefile
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv: nv3setup.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3_svga: s3probe.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/drivers/s3v: regs3v.h
	    s3v_cursor.c s3v_driver.c s3v_misc.c
	xsrc/xc/programs/Xserver/hw/xfree86/vga256/vga: vgaPCI.h
	xsrc/xc/programs/Xserver/include: servermd.h
	xsrc/xc/programs/Xserver/lbx: lbxopts.c
	xsrc/xc/programs/Xserver/mfb: mfbtegblt.c
	xsrc/xc/programs/Xserver/mi: mibstore.c
	xsrc/xc/programs/Xserver/os: utils.c
	xsrc/xc/programs/Xserver/record: set.c
	xsrc/xc/programs/lbxproxy/di: options.c wire.c
	xsrc/xc/programs/twm: add_window.c
	xsrc/xc/programs/x11perf: do_complex.c
	xsrc/xc/programs/xdm: dm.c session.c
	xsrc/xc/programs/xfs/difs: events.c
	xsrc/xc/programs/xkbcomp/keycodes: amiga
	xsrc/xc/programs/xkbcomp/keymap: amiga
	xsrc/xc/programs/xkbcomp/symbols: amiga
	xsrc/xc/programs/xrdb: xrdb.c
	xsrc/xc/programs/xterm: scrollbar.c xterm.h
Log Message:
Resolve conflicts caused by import of XFree86 3.3.3.