Merge branch 'mesa_7_6_branch'
authorMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:48:32 +0000 (10:48 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:48:32 +0000 (10:48 +0200)
commitc67bb22fe7b4a7176efd9177d8de413d7c1a9192
tree86539a3fc2d0a691d6729a5f00c356c7b6473217
parent774db70506670b4f4121b6697ac39abd184a56d9
parent1d4dbd8d9b00cdba8c4aef4a3994d8763fea0dff
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/intel/intel_context.c