Merge branch 'gallium-0.1' into gallium-tex-surfaces
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 20 May 2008 19:39:27 +0000 (13:39 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 20 May 2008 19:39:27 +0000 (13:39 -0600)
commit479174c398b5d15998852d7776900bf7ec0b1bcd
treef1f6bc52235e650c3a8fc178f1bcdd288e179e99
parent0a95f203fa6de3ed05c93e6788c7e2fdca170c94
parenta3f9ae4feada23a3b03b611bd34fac09410367c9
Merge branch 'gallium-0.1' into gallium-tex-surfaces
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_context.h