[Xf4vnc-cvs] CVS Update: xc (branch: trunk)
Brought to you by:
alanh
From: Alan H. <al...@us...> - 2003-02-25 14:24:50
|
CVSROOT: /cvsroot/xf4vnc Module name: xc Repository: xc/programs/Xserver/mi/ Changes by: alanh@sc8-pr-cvs1. 03/02/25 06:24:48 Log message: fix up conflicts from merge of XFree86 4.2.99.902-post Modified files: ./: Imakefile xc/config/cf/: X11.tmpl linux.cf xf86site.def xfree86.cf xc/extras/Mesa/docs/: RELNOTES-4.0.2 RELNOTES-4.0.3 RELNOTES-4.0.4 xc/extras/Mesa/include/GL/: gl.h xc/extras/Mesa/src/: KNOWN_BUGS varray.h xc/extras/Mesa/src/Trace/: tr_commands.h tr_write.h xc/extras/Mesa/src/X86/: 3dnow_normal.S mmx.h x86_xform2.S x86_xform3.S x86_xform4.S xc/extras/Mesa/src/math/: m_matrix.c xc/extras/Mesa/src/tnl/: t_context.c t_imm_api.c xc/extras/Mesa/src/tnl_dd/: t_dd_vbtmp.h xc/extras/Mesa/src/tnl_dd/imm/: t_dd_imm_capi.h t_dd_imm_napi.h t_dd_imm_primtmp.h t_dd_imm_tapi.h t_dd_imm_vapi.h t_dd_imm_vb.c t_dd_imm_vbtmp.h xc/extras/freetype2/builds/unix/: mkinstalldirs xc/extras/rman/: rman.1 rman.html xc/extras/rman/contrib/: bennett.txt hman.pl http-rman.c xc/include/extensions/: Imakefile xc/lib/: Imakefile xc/lib/zlib/: infblock.c xc/programs/Xserver/: Imakefile xc/programs/Xserver/Xext/: Imakefile xc/programs/Xserver/Xext/extmod/: Imakefile xc/programs/Xserver/dix/: property.c xc/programs/Xserver/hw/xfree86/: Imakefile xf86Version.h xc/programs/Xserver/hw/xfree86/drivers/apm/: apm_driver.c xc/programs/Xserver/hw/xfree86/drivers/ark/: ark_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/: aticursor.c r128_driver.c radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/chips/: ct_driver.c xc/programs/Xserver/hw/xfree86/drivers/cirrus/: alp_driver.c lg_driver.c xc/programs/Xserver/hw/xfree86/drivers/cyrix/: cyrix_driver.c xc/programs/Xserver/hw/xfree86/drivers/fbdev/: fbdev.c xc/programs/Xserver/hw/xfree86/drivers/glide/: Imakefile glide_driver.c xc/programs/Xserver/hw/xfree86/drivers/glint/: glint_driver.c xc/programs/Xserver/hw/xfree86/drivers/i128/: i128_driver.c xc/programs/Xserver/hw/xfree86/drivers/i740/: i740_driver.c xc/programs/Xserver/hw/xfree86/drivers/i810/: i810_driver.c i830_driver.c xc/programs/Xserver/hw/xfree86/drivers/imstt/: imstt_driver.c xc/programs/Xserver/hw/xfree86/drivers/mga/: mga_driver.c xc/programs/Xserver/hw/xfree86/drivers/neomagic/: neo_driver.c xc/programs/Xserver/hw/xfree86/drivers/newport/: newport_driver.c xc/programs/Xserver/hw/xfree86/drivers/nsc/: durango.c nsc.h nsc_driver.c nsc_fourcc.h nsc_galfns.c nsc_galstub.c nsc_gx1_accel.c nsc_gx1_cursor.c nsc_gx1_dga.c nsc_gx1_driver.c nsc_gx1_shadow.c nsc_gx1_video.c nsc_gx2_accel.c nsc_gx2_cursor.c nsc_gx2_dga.c nsc_gx2_driver.c nsc_gx2_shadow.c nsc_gx2_vga.c nsc_gx2_video.c nsc_regacc.c panel.c xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/: tv_fs451.c xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/: 92xx.h cen9211.h dora9211.c dora9211.h drac9210.c drac9210.h panel.c panel.h platform.c pnl_bios.c pnl_init.c xc/programs/Xserver/hw/xfree86/drivers/nv/: nv_driver.c xc/programs/Xserver/hw/xfree86/drivers/rendition/: rendition.c xc/programs/Xserver/hw/xfree86/drivers/s3/: s3_driver.c xc/programs/Xserver/hw/xfree86/drivers/s3virge/: s3v_driver.c xc/programs/Xserver/hw/xfree86/drivers/savage/: savage_driver.c xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/: smi_driver.c xc/programs/Xserver/hw/xfree86/drivers/sis/: sis_driver.c xc/programs/Xserver/hw/xfree86/drivers/tdfx/: tdfx_driver.c xc/programs/Xserver/hw/xfree86/drivers/tga/: tga_driver.c xc/programs/Xserver/hw/xfree86/drivers/trident/: trident_driver.c xc/programs/Xserver/hw/xfree86/drivers/tseng/: tseng_driver.c xc/programs/Xserver/hw/xfree86/drivers/vesa/: vesa.c xc/programs/Xserver/hw/xfree86/drivers/vmware/: svga_limits.h svga_reg.h xc/programs/Xserver/hw/xfree86/loader/: xf86sym.c xc/programs/Xserver/mi/: miinitext.c Revision Changes Path 1.4 +15 -9 xc/Imakefile 1.6 +117 -97 xc/config/cf/X11.tmpl 1.5 +12 -5 xc/config/cf/linux.cf 1.3 +295 -298 xc/config/cf/xf86site.def 1.7 +71 -4 xc/config/cf/xfree86.cf 1.4 +1 -1 xc/extras/Mesa/docs/RELNOTES-4.0.2 1.4 +1 -1 xc/extras/Mesa/docs/RELNOTES-4.0.3 1.3 +1 -1 xc/extras/Mesa/docs/RELNOTES-4.0.4 1.2 +401 -87 xc/extras/Mesa/include/GL/gl.h 1.2 +1 -1 xc/extras/Mesa/src/KNOWN_BUGS 1.3 +1 -1 xc/extras/Mesa/src/varray.h 1.2 +1 -1 xc/extras/Mesa/src/Trace/tr_commands.h 1.2 +1 -1 xc/extras/Mesa/src/Trace/tr_write.h 1.4 +18 -17 xc/extras/Mesa/src/X86/3dnow_normal.S 1.4 +1 -1 xc/extras/Mesa/src/X86/mmx.h 1.4 +1 -1 xc/extras/Mesa/src/X86/x86_xform2.S 1.4 +1 -1 xc/extras/Mesa/src/X86/x86_xform3.S 1.4 +1 -1 xc/extras/Mesa/src/X86/x86_xform4.S 1.4 +1 -1 xc/extras/Mesa/src/math/m_matrix.c 1.4 +2 -1 xc/extras/Mesa/src/tnl/t_context.c 1.4 +6 -3 xc/extras/Mesa/src/tnl/t_imm_api.c 1.4 +1 -1 xc/extras/Mesa/src/tnl_dd/t_dd_vbtmp.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_capi.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_napi.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_primtmp.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_tapi.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_vapi.h 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_vb.c 1.3 +1 -1 xc/extras/Mesa/src/tnl_dd/imm/t_dd_imm_vbtmp.h 1.3 +1 -1 xc/extras/freetype2/builds/unix/mkinstalldirs 1.3 +1 -1 xc/extras/rman/rman.1 1.3 +1 -1 xc/extras/rman/rman.html 1.4 +1 -1 xc/extras/rman/contrib/bennett.txt 1.3 +2 -2 xc/extras/rman/contrib/hman.pl 1.3 +1 -1 xc/extras/rman/contrib/http-rman.c 1.4 +16 -7 xc/include/extensions/Imakefile 1.5 +1 -5 xc/lib/Imakefile 1.4 +1 -1 xc/lib/zlib/infblock.c 1.7 +37 -29 xc/programs/Xserver/Imakefile 1.5 +1 -1 xc/programs/Xserver/Xext/Imakefile 1.5 +1 -1 xc/programs/Xserver/Xext/extmod/Imakefile 1.5 +1 -1 xc/programs/Xserver/dix/property.c 1.5 +6 -2 xc/programs/Xserver/hw/xfree86/Imakefile 1.5 +3 -3 xc/programs/Xserver/hw/xfree86/xf86Version.h 1.5 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c 1.5 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c 1.6 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/ati/aticursor.c 1.9 +87 -6 xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 1.8 +253 -136 xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 1.5 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c 1.4 +4 -1 xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile 1.3 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c 1.4 +23 -14 xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c 1.4 +4 -2 xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c 1.4 +2 -6 xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c 1.5 +8 -2 xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 1.5 +111 -3 xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c 1.6 +17 -3 xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 1.5 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c 1.5 +13 -5 xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c 1.2 +9 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c 1.2 +19 -8 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h 1.2 +7 -6 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h 1.2 +4 -4 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c 1.2 +142 -247 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c 1.2 +38 -5 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c 1.2 +123 -109 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c 1.2 +271 -103 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c 1.2 +132 -229 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c 1.2 +38 -4 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c 1.2 +141 -388 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c 1.2 +251 -107 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c 1.2 +10 -7 xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/92xx.h 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.h 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.c 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.h 1.2 +11 -10 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.h 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c 1.2 +3 -3 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c 1.2 +8 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c 1.2 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_init.c 1.6 +19 -10 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c 1.5 +4 -5 xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c 1.4 +73 -41 xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c 1.6 +8 -6 xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 1.5 +17 -18 xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c 1.5 +2025 -619 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 1.6 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c 1.3 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c 1.5 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 1.4 +1 -1 xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c 1.5 +3 -2 xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c 1.3 +2 -2 xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h 1.4 +2 -8 xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h 1.6 +18 -2 xc/programs/Xserver/hw/xfree86/loader/xf86sym.c 1.6 +14 -12 xc/programs/Xserver/mi/miinitext.c |