CVSROOT: /home/x-cvs
Module name: xc
Changes by: [EMAIL PROTECTED] 04/12/10 07:41:02
Log message:
resolve conflicts in Mesa 6.2.1 merge
Modified files:
xc/extras/Mesa/:
Makefile
xc/extras/Mesa/docs/:
VERSIONS
xc/extras/Mesa/src/mesa/drivers/dri/common/:
xmlconfig.c
xc/extras/Mesa/src/mesa/drivers/dri/r128/:
r128_ioctl.c
xc/extras/Mesa/src/mesa/drivers/dri/r200/:
r200_screen.c r200_swtcl.c r200_tcl.c
xc/extras/Mesa/src/mesa/drivers/dri/radeon/:
radeon_ioctl.c radeon_screen.c radeon_swtcl.c
radeon_tcl.c
xc/extras/Mesa/src/mesa/glapi/:
glapitemp.h
xc/extras/Mesa/src/mesa/main/:
dlist.c imports.h teximage.c
xc/extras/Mesa/src/mesa/sparc/:
clip.S norm.S sparc.c
xc/extras/Mesa/src/mesa/swrast/:
s_alphabuf.c s_texture.c
Revision Changes Path
1.4 +5 -3 xc/extras/Mesa/Makefile
1.9 +17 -0 xc/extras/Mesa/docs/VERSIONS
1.5 +5 -1
xc/extras/Mesa/src/mesa/drivers/dri/common/xmlconfig.c
1.5 +3 -3 xc/extras/Mesa/src/mesa/drivers/dri/r128/r128_ioctl.c
1.6 +17 -4
xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_screen.c
1.4 +22 -1 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_swtcl.c
1.4 +11 -12 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
1.6 +29 -17
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_ioctl.c
1.6 +6 -1
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c
1.4 +6 -6
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_swtcl.c
1.5 +11 -11
xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_tcl.c
1.5 +3 -3 xc/extras/Mesa/src/mesa/glapi/glapitemp.h
1.4 +2 -2 xc/extras/Mesa/src/mesa/main/dlist.c
1.7 +2 -2 xc/extras/Mesa/src/mesa/main/imports.h
1.5 +7 -1 xc/extras/Mesa/src/mesa/main/teximage.c
1.3 +2 -2 xc/extras/Mesa/src/mesa/sparc/clip.S
1.3 +3 -3 xc/extras/Mesa/src/mesa/sparc/norm.S
1.5 +6 -8 xc/extras/Mesa/src/mesa/sparc/sparc.c
1.5 +1 -4 xc/extras/Mesa/src/mesa/swrast/s_alphabuf.c
1.5 +1 -6 xc/extras/Mesa/src/mesa/swrast/s_texture.c
_______________________________________________
Cvs-commit mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/cvs-commit
