CVS Update: xc (branch: trunk)
Adam Jackson
xorg-commit at cvs.freedesktop.org
Tue Dec 14 21:30:53 EET 2004
CVSROOT: /cvs/xorg
Module name: xc
Changes by: ajax at gabe.freedesktop.org 04/12/14 11:30:53
Log message:
resolve conflicts from MESA-6_2-20041214 import
Modified files:
xc/extras/Mesa/include/GL/:
gl.h
xc/extras/Mesa/src/mesa/drivers/dri/common/:
dri_util.c
xc/extras/Mesa/src/mesa/drivers/dri/i915/:
i830_vtbl.c
xc/extras/Mesa/src/mesa/main/:
imports.h
xc/extras/Mesa/src/mesa/tnl/:
t_vertex_c.c
Revision Changes Path
1.3 +1 -1 xc/extras/Mesa/include/GL/gl.h
1.3 +60 -26 xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
1.5 +9 -1 xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c
1.5 +5 -4 xc/extras/Mesa/src/mesa/main/imports.h
1.4 +2 -15 xc/extras/Mesa/src/mesa/tnl/t_vertex_c.c
More information about the xorg-commit
mailing list