Merge commit 'origin/master' into gallium-sw-api-2
authorKeith Whitwell <keithw@vmware.com>
Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
committerKeith Whitwell <keithw@vmware.com>
Wed, 10 Mar 2010 08:29:27 +0000 (08:29 +0000)
commit155fbcb0ed85c6452cbedd2317f201100fe698ab
tree15e8a2662b1341bd07cebb9cd3624bc4ed42d020
parent9a8342ebcd83a2022b3c9b9539c5b15ac56d6440
parenteeaa0861bfc98a06ceec269801271b7453c4fcbd
Merge commit 'origin/master' into gallium-sw-api-2
src/gallium/drivers/cell/ppu/cell_context.h
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_context.h