Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Thu, 11 Nov 2010 20:07:42 +0000 (21:07 +0100)
committerChristian König <deathsimple@vodafone.de>
Thu, 11 Nov 2010 20:07:42 +0000 (21:07 +0100)
commit195bbe8ce218533569dde1368d04da0fd229913d
tree29d3db04673f59dcfd6663c524a5c1343d5cbee6
parent99b57bc20e839043ec6160502814085a0976fccc
parentd67df5dd9db1cede92f1b177c890f83809bb4582
Merge remote branch 'origin/master' into pipe-video
configure.ac
src/gallium/auxiliary/SConscript
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/softpipe/SConscript
src/gallium/drivers/softpipe/sp_screen.c