Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:19:10 +0000 (16:19 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:19:10 +0000 (16:19 +0000)
commitc4c86bbd16688ee4a0afb32efa27ba52abceb1ca
tree6b16fae74e49122a86ecf18b4a427b80d5a8e812
parent5b714723895d321db753f896576de5e2c27778c3
parentc303e7299b5f95d4728c3710c56f50b1fefca09d
Merge commit 'origin/master' into gallium-0.2
src/glx/x11/glxclient.h
src/mesa/shader/prog_statevars.c