Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Thu, 20 Jan 2011 21:10:37 +0000 (22:10 +0100)
committerChristian König <deathsimple@vodafone.de>
Thu, 20 Jan 2011 21:10:37 +0000 (22:10 +0100)
commitd2ff6b8715e817c1ef14d4bf12be58c19d894143
tree281badfe8638da50221270af29e16da1e40d9a6a
parente755c7bec3bc722ee451bdaed8da741f337d33b3
parentd136d1d2e1174d2420ce5e32507904243ab240cd
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/include/pipe/p_defines.h