Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 28 Sep 2009 16:02:20 +0000 (10:02 -0600)
commit8fda97afb8b7a03415dbca6d83691d2d6461126c
treed78b55385eed2b37baa4dcc8df8a63bcca95e6ac
parenteb82373abb08171d7fcb15b5f4f229fc9ca9aa91
parenteeb7e04da64fdae3a40b1afdcde71dcded2481f3
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/state_tracker/st_cb_texture.c