Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:51:45 +0000 (00:51 +0100)
committerChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:51:45 +0000 (00:51 +0100)
commite755c7bec3bc722ee451bdaed8da741f337d33b3
treed106cfea4baa1a9071b42d0e9bc922fad7502ed5
parenta96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b
parent93a95ad8ff1d543f886f123029d1329513729c4b
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_shader.c