CVS Update: xc (branch: )

[Eric Anholt]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	anholt at pdx.	04/06/16 02:21:42

xc/lib/GL

Update of /cvs/xorg/xc/lib/GL
In directory pdx:/tmp/cvs-serv26816

Log Message:
DRI XFree86-4_3_99_12-merge import

Status:

Vendor Tag:	DRI
Release Tags:	DRI-XFree86-4_3_99_12-merge
		
C xc/lib/GL/Imakefile
C xc/lib/GL/highpc.c
C xc/lib/GL/lowpc.c
C xc/lib/GL/makeprofile.sh
C xc/lib/GL/GL/GL-def.cpp
C xc/lib/GL/GL/Imakefile
C xc/lib/GL/dri/Imakefile
C xc/lib/GL/dri/dri_glx.c
C xc/lib/GL/dri/dri_glx.h
C xc/lib/GL/dri/dri_util.c
C xc/lib/GL/dri/dri_util.h
C xc/lib/GL/dri/xf86dri.h
C xc/lib/GL/dri/xf86dristr.h
C xc/lib/GL/dri/XF86dri.c
C xc/lib/GL/dri/drm/Imakefile
C xc/lib/GL/glx/Imakefile
C xc/lib/GL/glx/clientattrib.c
C xc/lib/GL/glx/compsize.c
C xc/lib/GL/glx/dispatch.c
C xc/lib/GL/glx/eval.c
C xc/lib/GL/glx/g_render.c
C xc/lib/GL/glx/g_single.c
C xc/lib/GL/glx/g_vendpriv.c
C xc/lib/GL/glx/glcontextmodes.c
C xc/lib/GL/glx/glcontextmodes.h
C xc/lib/GL/glx/glxclient.h
C xc/lib/GL/glx/glxcmds.c
C xc/lib/GL/glx/glxext.c
C xc/lib/GL/glx/glxextensions.c
C xc/lib/GL/glx/glxextensions.h
C xc/lib/GL/glx/indirect.h
C xc/lib/GL/glx/indirect_init.c
C xc/lib/GL/glx/indirect_init.h
C xc/lib/GL/glx/indirect_wrap.h
C xc/lib/GL/glx/packrender.h
C xc/lib/GL/glx/packsingle.h
C xc/lib/GL/glx/packvendpriv.h
C xc/lib/GL/glx/pixel.c
C xc/lib/GL/glx/pixelstore.c
C xc/lib/GL/glx/render2.c
C xc/lib/GL/glx/renderpix.c
C xc/lib/GL/glx/single2.c
C xc/lib/GL/glx/singlepix.c
C xc/lib/GL/glx/size.h
C xc/lib/GL/glx/vertarr.c
C xc/lib/GL/glx/xfont.c
C xc/lib/GL/mesa/src/Imakefile
C xc/lib/GL/mesa/src/Imakefile.inc
C xc/lib/GL/mesa/src/OSmesa/Imakefile
C xc/lib/GL/mesa/src/OSmesa/OSMesa-def.cpp
C xc/lib/GL/mesa/src/SPARC/Imakefile
C xc/lib/GL/mesa/src/SPARC/Imakefile.inc
C xc/lib/GL/mesa/src/X/Imakefile
C xc/lib/GL/mesa/src/X/Imakefile.inc
C xc/lib/GL/mesa/src/X86/Imakefile
C xc/lib/GL/mesa/src/X86/Imakefile.inc
C xc/lib/GL/mesa/src/array_cache/Imakefile
C xc/lib/GL/mesa/src/array_cache/Imakefile.inc
C xc/lib/GL/mesa/src/drv/Imakefile
C xc/lib/GL/mesa/src/drv/common/Imakefile
C xc/lib/GL/mesa/src/drv/common/Imakefile.inc
C xc/lib/GL/mesa/src/drv/common/depthtmp.h
C xc/lib/GL/mesa/src/drv/common/hwlog.c
C xc/lib/GL/mesa/src/drv/common/hwlog.h
C xc/lib/GL/mesa/src/drv/common/mm.c
C xc/lib/GL/mesa/src/drv/common/mm.h
C xc/lib/GL/mesa/src/drv/common/mmx.h
C xc/lib/GL/mesa/src/drv/common/spantmp.h
C xc/lib/GL/mesa/src/drv/common/stenciltmp.h
C xc/lib/GL/mesa/src/drv/common/texmem.c
C xc/lib/GL/mesa/src/drv/common/texmem.h
C xc/lib/GL/mesa/src/drv/common/utils.c
C xc/lib/GL/mesa/src/drv/common/utils.h
C xc/lib/GL/mesa/src/drv/common/vblank.c
C xc/lib/GL/mesa/src/drv/common/vblank.h
C xc/lib/GL/mesa/src/drv/ffb/Imakefile
C xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc
C xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_bitmap.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_context.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_fog.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_points.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_points.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_rendertmp.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_span.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_span.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_state.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_state.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_tex.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_tex.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_vbtmp.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_vtxfmt.h
C xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c
C xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h
C xc/lib/GL/mesa/src/drv/gamma/Imakefile
C xc/lib/GL/mesa/src/drv/gamma/Imakefile.inc
C xc/lib/GL/mesa/src/drv/gamma/gamma_client.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_context.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_context.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_dd.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_lock.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_lock.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_render.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_screen.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_screen.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_span.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_state.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_tex.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_texmem.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_texstate.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_tris.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_tris.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_tritmp.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_vb.c
C xc/lib/GL/mesa/src/drv/gamma/gamma_vb.h
C xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c
C xc/lib/GL/mesa/src/drv/i810/Imakefile
C xc/lib/GL/mesa/src/drv/i810/Imakefile.inc
C xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h
C xc/lib/GL/mesa/src/drv/i810/i810context.c
C xc/lib/GL/mesa/src/drv/i810/i810context.h
C xc/lib/GL/mesa/src/drv/i810/i810ioctl.c
C xc/lib/GL/mesa/src/drv/i810/i810ioctl.h
C xc/lib/GL/mesa/src/drv/i810/i810render.c
C xc/lib/GL/mesa/src/drv/i810/i810screen.c
C xc/lib/GL/mesa/src/drv/i810/i810screen.h
C xc/lib/GL/mesa/src/drv/i810/i810span.c
C xc/lib/GL/mesa/src/drv/i810/i810span.h
C xc/lib/GL/mesa/src/drv/i810/i810state.c
C xc/lib/GL/mesa/src/drv/i810/i810state.h
C xc/lib/GL/mesa/src/drv/i810/i810tex.c
C xc/lib/GL/mesa/src/drv/i810/i810tex.h
C xc/lib/GL/mesa/src/drv/i810/i810texmem.c
C xc/lib/GL/mesa/src/drv/i810/i810texstate.c
C xc/lib/GL/mesa/src/drv/i810/i810tris.c
C xc/lib/GL/mesa/src/drv/i810/i810tris.h
C xc/lib/GL/mesa/src/drv/i810/i810vb.c
C xc/lib/GL/mesa/src/drv/i810/i810vb.h
C xc/lib/GL/mesa/src/drv/i830/Imakefile
C xc/lib/GL/mesa/src/drv/i830/Imakefile.inc
C xc/lib/GL/mesa/src/drv/i830/i830_3d_reg.h
C xc/lib/GL/mesa/src/drv/i830/i830_context.c
C xc/lib/GL/mesa/src/drv/i830/i830_context.h
C xc/lib/GL/mesa/src/drv/i830/i830_debug.c
C xc/lib/GL/mesa/src/drv/i830/i830_debug.h
C xc/lib/GL/mesa/src/drv/i830/i830_ioctl.c
C xc/lib/GL/mesa/src/drv/i830/i830_ioctl.h
C xc/lib/GL/mesa/src/drv/i830/i830_render.c
C xc/lib/GL/mesa/src/drv/i830/i830_screen.c
C xc/lib/GL/mesa/src/drv/i830/i830_screen.h
C xc/lib/GL/mesa/src/drv/i830/i830_span.c
C xc/lib/GL/mesa/src/drv/i830/i830_span.h
C xc/lib/GL/mesa/src/drv/i830/i830_state.c
C xc/lib/GL/mesa/src/drv/i830/i830_state.h
C xc/lib/GL/mesa/src/drv/i830/i830_tex.c
C xc/lib/GL/mesa/src/drv/i830/i830_tex.h
C xc/lib/GL/mesa/src/drv/i830/i830_texmem.c
C xc/lib/GL/mesa/src/drv/i830/i830_texstate.c
C xc/lib/GL/mesa/src/drv/i830/i830_tris.c
C xc/lib/GL/mesa/src/drv/i830/i830_tris.h
C xc/lib/GL/mesa/src/drv/i830/i830_vb.c
C xc/lib/GL/mesa/src/drv/i830/i830_vb.h
C xc/lib/GL/mesa/src/drv/mga/Imakefile
C xc/lib/GL/mesa/src/drv/mga/Imakefile.inc
C xc/lib/GL/mesa/src/drv/mga/mga_texcombine.c
C xc/lib/GL/mesa/src/drv/mga/mga_texstate.c
C xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
C xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h
C xc/lib/GL/mesa/src/drv/mga/mgacontext.h
C xc/lib/GL/mesa/src/drv/mga/mgadd.c
C xc/lib/GL/mesa/src/drv/mga/mgadd.h
C xc/lib/GL/mesa/src/drv/mga/mgaioctl.c
C xc/lib/GL/mesa/src/drv/mga/mgaioctl.h
C xc/lib/GL/mesa/src/drv/mga/mgapixel.c
C xc/lib/GL/mesa/src/drv/mga/mgapixel.h
C xc/lib/GL/mesa/src/drv/mga/mgaregs.h
C xc/lib/GL/mesa/src/drv/mga/mgarender.c
C xc/lib/GL/mesa/src/drv/mga/mgaspan.c
C xc/lib/GL/mesa/src/drv/mga/mgaspan.h
C xc/lib/GL/mesa/src/drv/mga/mgastate.c
C xc/lib/GL/mesa/src/drv/mga/mgastate.h
C xc/lib/GL/mesa/src/drv/mga/mgatex.c
C xc/lib/GL/mesa/src/drv/mga/mgatex.h
C xc/lib/GL/mesa/src/drv/mga/mgatexmem.c
C xc/lib/GL/mesa/src/drv/mga/mgatris.c
C xc/lib/GL/mesa/src/drv/mga/mgatris.h
C xc/lib/GL/mesa/src/drv/mga/mgavb.c
C xc/lib/GL/mesa/src/drv/mga/mgavb.h
C xc/lib/GL/mesa/src/drv/r128/Imakefile
C xc/lib/GL/mesa/src/drv/r128/Imakefile.inc
C xc/lib/GL/mesa/src/drv/r128/r128_context.c
C xc/lib/GL/mesa/src/drv/r128/r128_context.h
C xc/lib/GL/mesa/src/drv/r128/r128_dd.c
C xc/lib/GL/mesa/src/drv/r128/r128_dd.h
C xc/lib/GL/mesa/src/drv/r128/r128_ioctl.c
C xc/lib/GL/mesa/src/drv/r128/r128_ioctl.h
C xc/lib/GL/mesa/src/drv/r128/r128_lock.c
C xc/lib/GL/mesa/src/drv/r128/r128_lock.h
C xc/lib/GL/mesa/src/drv/r128/r128_screen.c
C xc/lib/GL/mesa/src/drv/r128/r128_screen.h
C xc/lib/GL/mesa/src/drv/r128/r128_span.c
C xc/lib/GL/mesa/src/drv/r128/r128_span.h
C xc/lib/GL/mesa/src/drv/r128/r128_state.c
C xc/lib/GL/mesa/src/drv/r128/r128_state.h
C xc/lib/GL/mesa/src/drv/r128/r128_tex.c
C xc/lib/GL/mesa/src/drv/r128/r128_tex.h
C xc/lib/GL/mesa/src/drv/r128/r128_texmem.c
C xc/lib/GL/mesa/src/drv/r128/r128_texobj.h
C xc/lib/GL/mesa/src/drv/r128/r128_texstate.c
C xc/lib/GL/mesa/src/drv/r128/r128_tris.c
C xc/lib/GL/mesa/src/drv/r128/r128_tris.h
C xc/lib/GL/mesa/src/drv/r128/r128_vb.c
C xc/lib/GL/mesa/src/drv/r128/r128_vb.h
C xc/lib/GL/mesa/src/drv/r200/Imakefile
C xc/lib/GL/mesa/src/drv/r200/Imakefile.inc
C xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c
C xc/lib/GL/mesa/src/drv/r200/r200_context.c
C xc/lib/GL/mesa/src/drv/r200/r200_context.h
C xc/lib/GL/mesa/src/drv/r200/r200_ioctl.c
C xc/lib/GL/mesa/src/drv/r200/r200_ioctl.h
C xc/lib/GL/mesa/src/drv/r200/r200_lock.c
C xc/lib/GL/mesa/src/drv/r200/r200_lock.h
C xc/lib/GL/mesa/src/drv/r200/r200_maos.c
C xc/lib/GL/mesa/src/drv/r200/r200_maos.h
C xc/lib/GL/mesa/src/drv/r200/r200_maos_arrays.c
C xc/lib/GL/mesa/src/drv/r200/r200_maos_vbtmp.h
C xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c
C xc/lib/GL/mesa/src/drv/r200/r200_pixel.c
C xc/lib/GL/mesa/src/drv/r200/r200_pixel.h
C xc/lib/GL/mesa/src/drv/r200/r200_reg.h
C xc/lib/GL/mesa/src/drv/r200/r200_sanity.c
C xc/lib/GL/mesa/src/drv/r200/r200_sanity.h
C xc/lib/GL/mesa/src/drv/r200/r200_screen.c
C xc/lib/GL/mesa/src/drv/r200/r200_screen.h
C xc/lib/GL/mesa/src/drv/r200/r200_span.c
C xc/lib/GL/mesa/src/drv/r200/r200_span.h
C xc/lib/GL/mesa/src/drv/r200/r200_state.c
C xc/lib/GL/mesa/src/drv/r200/r200_state.h
C xc/lib/GL/mesa/src/drv/r200/r200_state_init.c
C xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c
C xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h
C xc/lib/GL/mesa/src/drv/r200/r200_tcl.c
C xc/lib/GL/mesa/src/drv/r200/r200_tcl.h
C xc/lib/GL/mesa/src/drv/r200/r200_tex.c
C xc/lib/GL/mesa/src/drv/r200/r200_tex.h
C xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
C xc/lib/GL/mesa/src/drv/r200/r200_texstate.c
C xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c
C xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.h
C xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_c.c
C xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_sse.c
C xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_x86.c
C xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S
C xc/lib/GL/mesa/src/drv/radeon/Imakefile
C xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc
C xc/lib/GL/mesa/src/drv/radeon/radeon_context.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_context.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_lock.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_lock.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_maos.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_maos.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_maos_arrays.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_maos_vbtmp.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_screen.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_span.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_span.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_state.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_state.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_state_init.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_tcl.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_tex.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_tex.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_texmem.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_texstate.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.h
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_c.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_sse.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt_x86.c
C xc/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S
C xc/lib/GL/mesa/src/drv/sis/Imakefile
C xc/lib/GL/mesa/src/drv/sis/Imakefile.inc
C xc/lib/GL/mesa/src/drv/sis/sis_alloc.c
C xc/lib/GL/mesa/src/drv/sis/sis_alloc.h
C xc/lib/GL/mesa/src/drv/sis/sis_clear.c
C xc/lib/GL/mesa/src/drv/sis/sis_common2.h
C xc/lib/GL/mesa/src/drv/sis/sis_context.c
C xc/lib/GL/mesa/src/drv/sis/sis_context.h
C xc/lib/GL/mesa/src/drv/sis/sis_dd.c
C xc/lib/GL/mesa/src/drv/sis/sis_dd.h
C xc/lib/GL/mesa/src/drv/sis/sis_debug.c
C xc/lib/GL/mesa/src/drv/sis/sis_debug.h
C xc/lib/GL/mesa/src/drv/sis/sis_fog.c
C xc/lib/GL/mesa/src/drv/sis/sis_lock.c
C xc/lib/GL/mesa/src/drv/sis/sis_lock.h
C xc/lib/GL/mesa/src/drv/sis/sis_reg.h
C xc/lib/GL/mesa/src/drv/sis/sis_screen.c
C xc/lib/GL/mesa/src/drv/sis/sis_screen.h
C xc/lib/GL/mesa/src/drv/sis/sis_span.c
C xc/lib/GL/mesa/src/drv/sis/sis_span.h
C xc/lib/GL/mesa/src/drv/sis/sis_state.c
C xc/lib/GL/mesa/src/drv/sis/sis_state.h
C xc/lib/GL/mesa/src/drv/sis/sis_stencil.c
C xc/lib/GL/mesa/src/drv/sis/sis_stencil.h
C xc/lib/GL/mesa/src/drv/sis/sis_tex.c
C xc/lib/GL/mesa/src/drv/sis/sis_tex.h
C xc/lib/GL/mesa/src/drv/sis/sis_texstate.c
C xc/lib/GL/mesa/src/drv/sis/sis_tris.c
C xc/lib/GL/mesa/src/drv/sis/sis_tris.h
C xc/lib/GL/mesa/src/drv/sis/sis_tritmp.h
C xc/lib/GL/mesa/src/drv/sis/sis_vb.c
C xc/lib/GL/mesa/src/drv/sis/sis_vb.h
C xc/lib/GL/mesa/src/drv/tdfx/BUGS
C xc/lib/GL/mesa/src/drv/tdfx/Imakefile
C xc/lib/GL/mesa/src/drv/tdfx/Imakefile.inc
C xc/lib/GL/mesa/src/drv/tdfx/dri_glide.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_dd.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_glide.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_lock.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_pixels.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_span.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_texman.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_texstate.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_tris.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.c
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_vb.h
C xc/lib/GL/mesa/src/drv/tdfx/tdfx_vbtmp.h
C xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S
C xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h
C xc/lib/GL/mesa/src/math/Imakefile
C xc/lib/GL/mesa/src/math/Imakefile.inc
C xc/lib/GL/mesa/src/swrast/Imakefile
C xc/lib/GL/mesa/src/swrast/Imakefile.inc
C xc/lib/GL/mesa/src/swrast_setup/Imakefile
C xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc
C xc/lib/GL/mesa/src/tnl/Imakefile
C xc/lib/GL/mesa/src/tnl/Imakefile.inc
C xc/lib/GL/mesa/src/tnl_dd/Imakefile
C xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc
C xc/lib/GL/include/GL/internal/glcore.h

389 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jDRI:yesterday -jDRI xc/lib/GL