Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Thu, 20 Jan 2011 21:43:18 +0000 (22:43 +0100)
committerChristian König <deathsimple@vodafone.de>
Thu, 20 Jan 2011 21:43:18 +0000 (22:43 +0100)
commit78faf8d0e9c276a0ff1465e501d58fb3d66de2f7
tree4e124bd6b511e408c5e113c4166b8fa97fd75b24
parentd2ff6b8715e817c1ef14d4bf12be58c19d894143
parent37233f1ee0213a224611788bbab38840ba9f8308
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_asm.c
configs/autoconf.in
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_shader.c