CVS: cvs.openbsd.org: XF4

[Matthieu Herrb <matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	XF4
Changes by:	matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2004/03/18 13:54:26

Modified files:
	xc/config/cf   : Imake.rules X11.tmpl xfree86.cf 
	xc/fonts/scaled/Speedo: Imakefile 
	xc/lib/font/FreeType: ftfuncs.c ftfuncs.h xttcap.c 
	xc/lib/font/fontfile: encparse.c 
	xc/lib/freetype2: freetype-def.cpp 
	xc/lib/xtrans  : Xtranssock.c 
	xc/programs/Xserver/Xext: dpms.c 
	xc/programs/Xserver/hw/xfree86: CHANGELOG 
	xc/programs/Xserver/hw/xfree86/common: xf86xv.c 
	xc/programs/Xserver/hw/xfree86/drivers/ati: Imakefile atichip.c 
	                                            atichip.h 
	                                            aticonfig.c 
	                                            atilock.c atimisc.c 
	                                            atiprobe.c 
	                                            atistruct.h 
	                                            ativersion.h 
	                                            radeon_accel.c 
	                                            radeon_driver.c 
	                                            radeon_reg.h 
	xc/programs/Xserver/hw/xfree86/drivers/i810: i830.h 
	                                             i830_driver.c 
	xc/programs/Xserver/hw/xfree86/drivers/imstt: imstt_reg.h 
	xc/programs/Xserver/hw/xfree86/drivers/mga: mga.h mga_arc.c 
	                                            mga_dac3026.c 
	                                            mga_dacG.c 
	                                            mga_driver.c 
	                                            mga_storm.c 
	                                            mga_video.c 
	xc/programs/Xserver/hw/xfree86/drivers/neomagic: neo_driver.c 
	xc/programs/Xserver/hw/xfree86/drivers/rendition: vmodes.c 
	xc/programs/Xserver/hw/xfree86/drivers/sis: 300vtbl.h 310vtbl.h 
	                                            init.c init.h 
	                                            init301.c init301.h 
	                                            initdef.h oem300.h 
	                                            oem310.h osdef.h 
	                                            sis.h sis300_accel.c 
	                                            sis300_accel.h 
	                                            sis310_accel.c 
	                                            sis310_accel.h 
	                                            sis6326_video.c 
	                                            sis_accel.c 
	                                            sis_accel.h 
	                                            sis_cursor.c 
	                                            sis_cursor.h 
	                                            sis_dac.c sis_dac.h 
	                                            sis_driver.c 
	                                            sis_driver.h 
	                                            sis_opt.c sis_regs.h 
	                                            sis_setup.c sis_vb.c 
	                                            sis_vb.h sis_vga.c 
	                                            sis_video.c 
	                                            vgatypes.h vstruct.h 
	xc/programs/Xserver/hw/xfree86/drivers/trident: blade_accel.c 
	                                                image_accel.c 
	                                                trident_accel.c 
	                                                xp_accel.c 
	xc/programs/Xserver/hw/xfree86/drivers/via: via_bios.c 
	                                            via_driver.c 
	xc/programs/Xserver/hw/xfree86/etc: pci.ids 
	xc/programs/Xserver/hw/xfree86/loader: dixsym.c 
	xc/programs/Xserver/hw/xfree86/os-support/bsd: alpha_video.c 
	xc/programs/Xserver/hw/xfree86/os-support/linux/int10: linux.c 
	xc/programs/Xserver/os: WaitFor.c 
	xc/programs/xkbcomp/symbols: gb 
	xc/programs/xkbcomp/symbols/pc: gb 
Removed files:
	xc/util/compress: Makefile README USERMEM compress.1 compress.c 
	                  usermem.sh 

Log message:
Merge bits of final XFree86 4.4 not affected by the new license.
ok deraadt_(_at_)__(_dot_)_