Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 16:52:15 +0000 (10:52 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 16:52:15 +0000 (10:52 -0600)
commit7549a8397b310acf672f97a08c8e7d866cdf492c
tree98166a8670ad275f1149dc24bf027cd46e03d32f
parenta64d4516a0d6219dec0b5b0622215918469faecc
parent2acd5de22651a3461c0576107c8e8fab1f01469a
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/mesa/shader/prog_execute.c
src/mesa/state_tracker/st_draw.c
src/mesa/swrast/s_fragprog.c