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)
commitcefee4e327c92daa2f01b6de650a43eddd348063
treed1d25c4883357b12fd0c1deecc49cddc7e46976d
parentd4dc2e30dada1be425e95ba270920db6eb210982
parent7118db870091d4c9c2465e79f361ff0ed36d1f90
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_queryobj.c