Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Fri, 4 Mar 2011 16:15:43 +0000 (17:15 +0100)
committerChristian König <deathsimple@vodafone.de>
Fri, 4 Mar 2011 16:15:43 +0000 (17:15 +0100)
commit54f11a27a1ec28fcf9734f4454dee870bc0113f8
tree2dc71d95b1ad5d2ca966bbb6726fba45b4cfbac1
parent0eccb1038a620bc76ba45ac00c293b3e88427510
parent6838c9ce74f16c765474c0d2b4ae1469dd4a64d5
Merge remote branch 'origin/master' into pipe-video
src/gallium/drivers/r600/r600_texture.c