Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Wed, 2 Mar 2011 23:59:12 +0000 (00:59 +0100)
committerChristian König <deathsimple@vodafone.de>
Wed, 2 Mar 2011 23:59:12 +0000 (00:59 +0100)
commit0eccb1038a620bc76ba45ac00c293b3e88427510
tree4bd9209ac6e9b824284d47799b13a99a401c6963
parented12c29bc45b100b758c9affe2cebe8c8498e25e
parent2e756f3d6f15d61297a3bb4efe6a88c29081a5eb
Merge remote branch 'origin/master' into pipe-video
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c
src/gallium/drivers/softpipe/sp_screen.c