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)
1  2 
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_context.h

Simple merge