CVS Update: xc (branch: )

[Eric Anholt]

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

xc/include/GL

Update of /cvs/xorg/xc/include/GL
In directory pdx:/tmp/cvs-serv30162

Log Message:
DRI trunk-20040613 import

Status:

Vendor Tag:	DRI
Release Tags:	DRI-trunk-20040613
		
C xc/include/GL/Imakefile
U xc/include/GL/glu.h
U xc/include/GL/glx.h
U xc/include/GL/glxint.h
U xc/include/GL/glxmd.h
C xc/include/GL/glxproto.h
C xc/include/GL/glxtokens.h

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

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