Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 29 Oct 2009 00:27:25 +0000 (18:27 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 29 Oct 2009 00:27:25 +0000 (18:27 -0600)
commit0ea575d721821262a862ceef010db9b1a8b4a6d9
tree35e7ad9b0192f4bb6c5cfc8919b9c12bfc52f5f3
parent24c61c8c2e2747f73b963a7019485eb5105b853c
parent96128fdf2f959e2b59eca8f234dc6f3adf7a553f
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/main/texstore.c