Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Sat, 24 Oct 2009 00:38:43 +0000 (18:38 -0600)
committerBrian Paul <brianp@vmware.com>
Sat, 24 Oct 2009 00:38:43 +0000 (18:38 -0600)
commit46a784b7fd2dcab97c26d5ca02fb8f74945ba157
tree28196459475a6ba99ae64be0bce53d1b83ac52c9
parent26f1ad65b988fe55ae12a99994e4c63aaab899a0
parentdc8b139aa23899b00baa919fd7f46c74bf4ef205
Merge branch 'mesa_7_6_branch'
src/mesa/main/fbobject.c