Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
authorMaciej Cencora <m.cencora@gmail.com>
Wed, 18 Nov 2009 21:09:33 +0000 (22:09 +0100)
committerMaciej Cencora <m.cencora@gmail.com>
Wed, 18 Nov 2009 21:09:33 +0000 (22:09 +0100)
1  2 
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_queryobj.c