Merge branch 'master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Mon, 22 Sep 2008 05:30:55 +0000 (22:30 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Mon, 22 Sep 2008 05:30:55 +0000 (22:30 -0700)
commitdace236c5fffa29d59e4d12fa865889bbecbdd24
treeea6a1d6fde371ad9ebbd7f050de8f35860e56213
parente61793a7c01588f2e6235f1271af4c58fa8adad4
parent6fd15dd80666ccb1e9b99cedd306e32cc7cee989
Merge branch 'master' into gallium-0.2

Conflicts:

src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
src/mesa/main/mipmap.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/shader/program.c
src/mesa/shader/shader_api.c
src/mesa/x86/common_x86_asm.S