Merge branch 'gallium-0.1' into gallium-tex-surfaces
authorBrian Paul <brian.paul@tungstengraphics.com>
Tue, 20 May 2008 21:12:50 +0000 (15:12 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Tue, 20 May 2008 21:12:50 +0000 (15:12 -0600)
1  2 
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_gen_mipmap.c

Simple merge