Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:27:24 +0000 (18:27 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:27:24 +0000 (18:27 -0800)
commit48302e9b309c7ce218de2e522c91bdc87e61cdbc
tree8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849
parentb57abd3bea29e95e5dee2524c3f1be4b26017c0f
parent75ad099d3cecc64fe04477ca84bf58b7720edf28
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
scons/gallium.py
scons/generic.py
src/mesa/main/version.h