CVS Update: xc (branch: )

[Eric Anholt]

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

xc/lib/GL

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

Log Message:
DRI trunk-20040613 import

Status:

Vendor Tag:	DRI
Release Tags:	DRI-trunk-20040613
		
C xc/lib/GL/Imakefile
C xc/lib/GL/GL/GL-def.cpp
C xc/lib/GL/GL/Imakefile
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
U xc/lib/GL/glx/eval.c
C xc/lib/GL/glx/g_render.c
U xc/lib/GL/glx/g_single.c
U xc/lib/GL/glx/g_vendpriv.c
N xc/lib/GL/glx/glx_pbuffer.c
N xc/lib/GL/glx/glx_query.c
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
U 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
U xc/lib/GL/glx/xfont.c
N xc/lib/GL/glx/XF86dri.c
N xc/lib/GL/glx/dri_glx.c
N xc/lib/GL/glx/dri_glx.h
N xc/lib/GL/glx/xf86dri.h
N xc/lib/GL/glx/xf86dristr.h
N xc/lib/GL/mesa/Imakefile.inc
N xc/lib/GL/mesa/Imakefile
N xc/lib/GL/mesa/shader/Imakefile
N xc/lib/GL/mesa/shader/Imakefile.inc
N xc/lib/GL/mesa/swrast/Imakefile
N xc/lib/GL/mesa/swrast/Imakefile.inc
N xc/lib/GL/mesa/x86/Imakefile
N xc/lib/GL/mesa/x86/Imakefile.inc
N xc/lib/GL/mesa/array_cache/Imakefile
N xc/lib/GL/mesa/array_cache/Imakefile.inc
N xc/lib/GL/mesa/tnl_dd/Imakefile
N xc/lib/GL/mesa/tnl_dd/Imakefile.inc
N xc/lib/GL/mesa/main/Imakefile
N xc/lib/GL/mesa/main/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/Imakefile
N xc/lib/GL/mesa/drivers/dri/savage/Imakefile
N xc/lib/GL/mesa/drivers/dri/savage/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/common/Imakefile
N xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/ffb/Imakefile
N xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/gamma/Imakefile
N xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/i810/Imakefile
N xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/mach64/Imakefile
N xc/lib/GL/mesa/drivers/dri/mach64/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/i830/Imakefile
N xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/r128/Imakefile
N xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/r200/Imakefile
N xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/radeon/Imakefile
N xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/sis/Imakefile
N xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile
N xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/mga/Imakefile
N xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc
N xc/lib/GL/mesa/drivers/dri/via/Imakefile
N xc/lib/GL/mesa/drivers/dri/via/Imakefile.inc
N xc/lib/GL/mesa/drivers/osmesa/Imakefile
N xc/lib/GL/mesa/drivers/x11/Imakefile
N xc/lib/GL/mesa/drivers/x11/Imakefile.inc
N xc/lib/GL/mesa/sparc/Imakefile
N xc/lib/GL/mesa/sparc/Imakefile.inc
N xc/lib/GL/mesa/swrast_setup/Imakefile
N xc/lib/GL/mesa/swrast_setup/Imakefile.inc
N xc/lib/GL/mesa/tnl/Imakefile
N xc/lib/GL/mesa/tnl/Imakefile.inc
N xc/lib/GL/mesa/math/Imakefile
N xc/lib/GL/mesa/math/Imakefile.inc

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

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