Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:48:10 +0000 (00:48 +0100)
committerChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:48:10 +0000 (00:48 +0100)
commita96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b
treed106cfea4baa1a9071b42d0e9bc922fad7502ed5
parent7965e2fc16853ae0ed0a9cde77346c25feb19b6e
parentcc0f604241ee7b536f4c9867573024b8673b0998
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_shader.c
configs/autoconf.in
configure.ac