CVSROOT: /home/x-cvs
Module name: xc
Changes by: [EMAIL PROTECTED] 02/10/29 10:19:43
Log message:
resolve conflicts
Modified files:
xc/extras/Mesa/include/GL/:
gl.h
xc/extras/Mesa/src/:
attrib.c context.c enable.c extensions.c get.c glapi.c
image.c pixel.c texformat.c texformat.h teximage.c
texobj.c texutil.c
xc/extras/Mesa/src/X/:
fakeglx.c glxapi.c glxapi.h realglx.c realglx.h xm_dd.c
xc/extras/Mesa/src/X86/:
common_x86_asm.S
Removed files:
xc/extras/Mesa/docs/:
MESA_agp_offset.spec MESA_pack_invert.spec
MESA_ycbcr_texture.spec RELNOTES-3.4
Revision Changes Path
1.15 +41 -9 xc/extras/Mesa/include/GL/gl.h
1.14 +10 -7 xc/extras/Mesa/src/attrib.c
1.16 +1 -32 xc/extras/Mesa/src/context.c
1.12 +17 -34 xc/extras/Mesa/src/enable.c
1.13 +7 -4 xc/extras/Mesa/src/extensions.c
1.16 +24 -45 xc/extras/Mesa/src/get.c
1.12 +0 -8 xc/extras/Mesa/src/glapi.c
1.17 +43 -8 xc/extras/Mesa/src/image.c
1.9 +19 -2 xc/extras/Mesa/src/pixel.c
1.4 +49 -4 xc/extras/Mesa/src/texformat.c
1.5 +12 -9 xc/extras/Mesa/src/texformat.h
1.21 +115 -50 xc/extras/Mesa/src/teximage.c
1.15 +11 -1 xc/extras/Mesa/src/texobj.c
1.13 +141 -44 xc/extras/Mesa/src/texutil.c
1.17 +35 -0 xc/extras/Mesa/src/X/fakeglx.c
1.8 +49 -3 xc/extras/Mesa/src/X/glxapi.c
1.7 +11 -3 xc/extras/Mesa/src/X/glxapi.h
1.6 +10 -3 xc/extras/Mesa/src/X/realglx.c
1.6 +18 -1 xc/extras/Mesa/src/X/realglx.h
1.5 +2 -1 xc/extras/Mesa/src/X/xm_dd.c
1.14 +3 -2 xc/extras/Mesa/src/X86/common_x86_asm.S
_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit
