Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 16:51:27 +0000 (09:51 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 16:51:27 +0000 (09:51 -0700)
commite128cc205e30540597ecd57849060a6bf4714d9f
tree23b44ead4f4ed55c7c43d8cef9e0d691c1419f2b
parentb605f4ff11c894500f2d0273c5d4653ff413448d
parent7d41b4248bee1d926646ef5fdff07da4f9026589
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
src/mesa/shader/programopt.c