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)
1  2 
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/main/texstore.c

Simple merge