Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Oct 2008 14:26:28 +0000 (15:26 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Oct 2008 14:26:28 +0000 (15:26 +0100)
commit3a3801c1431203fc4dca24d56577995ae2e78956
tree7ec341b78ecc62dc1a238392aff828c363148d69
parentd7f1cb5b5a134b63227d5746a2dd1f05597c5c2f
parent7216679c1998b49ff5b08e6b43f8d5779415bf54
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
src/mesa/glapi/glapi.c
src/mesa/main/extensions.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/teximage.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/program.c
src/mesa/shader/shader_api.c