Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:39:20 +0000 (10:39 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:39:20 +0000 (10:39 +0200)
commit1d4dbd8d9b00cdba8c4aef4a3994d8763fea0dff
treedf00e2ea41965bf19c253935b6ef6ff536ae18b2
parent284a7af274bc148f112bd0ebb40583923ee26b49
parent999592745f40a96a7307da374cab4d68254acf75
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/mesa/drivers/dri/intel/intel_context.c