Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 13 May 2009 17:33:52 +0000 (11:33 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 13 May 2009 17:33:52 +0000 (11:33 -0600)
commitca327b1688a8f70a4d01bf80d11508c90aafe64f
tree0884267abbc885d99f0d66178fe967be7632298b
parentac5bf63f7408414bf8d7993ad77d92b76830cec6
parent99960393edb3d6c0d3702cf51b59c2e4189117c7
Merge branch 'mesa_7_5_branch'
src/mesa/drivers/dri/intel/intel_context.c