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)
commited24e19070b7dff12670151b2d184f31c845ccae
tree98b47585f9223ee95cbbf541e6434598d9439491
parent85e1fa55066783d2748993810708dee6db7a4993
parenta2a6799fbefc6900f2371efab778c5bc2bf5a6e9
Merge branch 'pipe-video'
configure.ac
src/gallium/drivers/nvfx/nvfx_screen.c