Merge branch 'pipe-video'
authorChristian König <deathsimple@vodafone.de>
Wed, 13 Jul 2011 20:56:06 +0000 (22:56 +0200)
committerChristian König <deathsimple@vodafone.de>
Wed, 13 Jul 2011 20:56:06 +0000 (22:56 +0200)
1  2 
configure.ac
src/gallium/drivers/nvfx/nvfx_screen.c

diff --cc configure.ac
Simple merge