CVS Update: xc (branch: )

[Eric Anholt]

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

xc/programs/Xserver/GL

Update of /cvs/xorg/xc/programs/Xserver/GL
In directory pdx:/tmp/cvs-serv28058

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/programs/Xserver/GL/glxmodule.c
C xc/programs/Xserver/GL/Imakefile
C xc/programs/Xserver/GL/include/GL/glx_ansic.h
C xc/programs/Xserver/GL/include/GL/xf86glx.h
C xc/programs/Xserver/GL/opengl/Imakefile
C xc/programs/Xserver/GL/mesa/Imakefile
C xc/programs/Xserver/GL/mesa/src/Imakefile
C xc/programs/Xserver/GL/mesa/src/X/Imakefile
C xc/programs/Xserver/GL/mesa/src/X/xf86glx.c
C xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c
C xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h
C xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h
C xc/programs/Xserver/GL/mesa/src/X/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
C xc/programs/Xserver/GL/mesa/src/array_cache/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/math/Imakefile
C xc/programs/Xserver/GL/mesa/src/math/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
C xc/programs/Xserver/GL/mesa/src/swrast/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
C xc/programs/Xserver/GL/mesa/src/swrast_setup/module/Imakefile
C xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
C xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile
C xc/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp
C xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
C xc/programs/Xserver/GL/mesa/GLcore/Imakefile
C xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile
C xc/programs/Xserver/GL/aqua/Imakefile
C xc/programs/Xserver/GL/aqua/aquaGlx.c
C xc/programs/Xserver/GL/glx/g_disptab.c
C xc/programs/Xserver/GL/glx/g_disptab.h
C xc/programs/Xserver/GL/glx/g_disptab_EXT.c
C xc/programs/Xserver/GL/glx/g_disptab_EXT.h
C xc/programs/Xserver/GL/glx/g_render.c
C xc/programs/Xserver/GL/glx/g_renderswap.c
C xc/programs/Xserver/GL/glx/g_single.c
C xc/programs/Xserver/GL/glx/g_singleswap.c
C xc/programs/Xserver/GL/glx/global.c
C xc/programs/Xserver/GL/glx/glx-def.cpp
C xc/programs/Xserver/GL/glx/glxbuf.c
C xc/programs/Xserver/GL/glx/glxbuf.h
C xc/programs/Xserver/GL/glx/glxcmds.c
C xc/programs/Xserver/GL/glx/glxcmdsswap.c
C xc/programs/Xserver/GL/glx/glxcontext.h
C xc/programs/Xserver/GL/glx/glxdrawable.h
C xc/programs/Xserver/GL/glx/glxerror.h
C xc/programs/Xserver/GL/glx/glxext.c
C xc/programs/Xserver/GL/glx/glxext.h
C xc/programs/Xserver/GL/glx/glxfb.c
C xc/programs/Xserver/GL/glx/glxfb.h
C xc/programs/Xserver/GL/glx/xfont.c
C xc/programs/Xserver/GL/glx/glximports.c
C xc/programs/Xserver/GL/glx/glximports.h
C xc/programs/Xserver/GL/glx/glxmem.c
C xc/programs/Xserver/GL/glx/glxmem.h
C xc/programs/Xserver/GL/glx/glxpix.c
C xc/programs/Xserver/GL/glx/glxpix.h
C xc/programs/Xserver/GL/glx/glxscreens.c
C xc/programs/Xserver/GL/glx/glxscreens.h
C xc/programs/Xserver/GL/glx/glxserver.h
C xc/programs/Xserver/GL/glx/glxutil.c
C xc/programs/Xserver/GL/glx/glxutil.h
C xc/programs/Xserver/GL/glx/impsize.h
C xc/programs/Xserver/GL/glx/render2.c
C xc/programs/Xserver/GL/glx/render2swap.c
C xc/programs/Xserver/GL/glx/renderpix.c
C xc/programs/Xserver/GL/glx/renderpixswap.c
C xc/programs/Xserver/GL/glx/rensize.c
C xc/programs/Xserver/GL/glx/rensizetab.c
C xc/programs/Xserver/GL/glx/single2.c
C xc/programs/Xserver/GL/glx/singlepix.c
C xc/programs/Xserver/GL/glx/singlepixswap.c
C xc/programs/Xserver/GL/glx/singlesize.c
C xc/programs/Xserver/GL/glx/singlesize.h
C xc/programs/Xserver/GL/glx/unpack.h
C xc/programs/Xserver/GL/glx/single2swap.c
C xc/programs/Xserver/GL/glx/Imakefile
C xc/programs/Xserver/GL/dri/Imakefile
C xc/programs/Xserver/GL/dri/dri-def.cpp
C xc/programs/Xserver/GL/dri/dri.c
C xc/programs/Xserver/GL/dri/dri.h
C xc/programs/Xserver/GL/dri/drimodule.c
C xc/programs/Xserver/GL/dri/dristruct.h
C xc/programs/Xserver/GL/dri/sarea.h
C xc/programs/Xserver/GL/dri/xf86dri.c

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

	cvs checkout -jDRI:yesterday -jDRI xc/programs/Xserver/GL