Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 26 Jan 2010 20:23:25 +0000 (13:23 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 26 Jan 2010 20:25:53 +0000 (13:25 -0700)
commit43867acb6afc7fad26cdc2f22b2a3bb6eeefb2da
tree4fdb4589a9820b78e79c5192778ed81f9e04855c
parent06d228d8b92b7f4031f0596d498c24c4ed952e68
parent68ca19afd7299fa9c686f95d53b7e14df37aba4c
Merge branch 'mesa_7_7_branch'

Merging was easier than cherry picking in this instance.
src/mesa/main/fbobject.c