Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Thu, 20 Nov 2008 13:44:13 +0000 (13:44 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Thu, 20 Nov 2008 13:44:13 +0000 (13:44 +0000)
commitef2bf418b45c7966e9fe78359058b8d44f570be1
treec0bc3be44bae336ca4c9133ffb2529c8d99bbc0f
parent4f3dcf3864c3cbd8a6ebc6af38e53d57e4d421d6
parentb6bb5e09e0ad1f61f96c65bbc870bd493df12f1a
Merge commit 'origin/master' into gallium-0.2
src/mesa/main/image.c
src/mesa/main/texenvprogram.c
src/mesa/main/texstore.c