Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 29 Jun 2009 21:27:49 +0000 (15:27 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 29 Jun 2009 21:27:49 +0000 (15:27 -0600)
commitb8c479d4b0519bde0e395ea669b017b6a6188146
tree31a7fdc1e5100f709c1075250096e150703d8ec2
parent423f45d18a665423e319dcea08c11ff9f5646a80
parent4e43126a5915b1233c89c61400c8270d23d48ea3
Merge branch 'mesa_7_5_branch'
src/mesa/drivers/dri/intel/intel_context.c