Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 14:56:34 +0000 (16:56 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 14:56:34 +0000 (16:56 +0200)
commit2fe65e8f149e961afb8ccd9b1e57c5c7e96ecfd6
tree4eecf639463b6fa8b25d9e838e692c6b34a22b43
parent6791576f6cc90018bd65c263fa6c16ad2b19cdae
parentb799af91d5ffbee1481161fec29eb4c92b161272
Merge branch 'mesa_7_5_branch'
progs/glsl/multitex.c
scons/gallium.py