Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:12:24 +0000 (21:12 +0100)
committerChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:12:24 +0000 (21:12 +0100)
commite179a8bf34022c200deee92d328cb1bae3c3aa4a
tree4c67616380e7c0efa2d7ff0fe67fd18af2fa11ad
parent1b03996b1269fb8b2f89e0a013d8427da660ff83
parent38c8b034e2775640c588711290c244632dcc2475
Merge remote branch 'origin/master' into pipe-video
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state.c