Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sun, 15 May 2011 17:26:53 +0000 (19:26 +0200)
committerChristian König <deathsimple@vodafone.de>
Sun, 15 May 2011 17:26:53 +0000 (19:26 +0200)
commit828540e491d88b9b6217e6568873a78462919ae8
treec952145c1188cdf6b9c56902f8f5c189e090c278
parent3db6514357a7c634045ae7bc7bba7d7dbf9d58c5
parentbd5b7a6f7113da38a2c1f07a4a71e9993666a567
Merge remote-tracking branch 'origin/master' into pipe-video
configure.ac
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/r600_state.c
src/gallium/winsys/r600/drm/r600_hw_context.c