CVS Update: xc (branch: )
Eric Anholt
xorg-commit at pdx.freedesktop.org
Wed Jun 16 12:21:44 EEST 2004
CVSROOT: /cvs/xorg
Module name: xc
Changes by: anholt at pdx. 04/06/16 02:21:44
xc/include/GL
Update of /cvs/xorg/xc/include/GL
In directory pdx:/tmp/cvs-serv27956
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/include/GL/Imakefile
C xc/include/GL/glu.h
C xc/include/GL/glx.h
C xc/include/GL/glxint.h
C xc/include/GL/glxmd.h
C xc/include/GL/glxproto.h
C xc/include/GL/glxtokens.h
7 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jDRI:yesterday -jDRI xc/include/GL
More information about the xorg-commit
mailing list