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)
commit8f792a0707446a7b020e6d47a5fff310a36ca81d
tree8a051f4925d955be98a7d6a8fa4ac6a34c71d5bf
parentcf1ae676ec7cbf3a8595d41fb6b5128ff142b402
parent7899ecdd6502a323b052f9ad4acd23cbb9ba88db
Merge branch 'gallium-0.1' into gallium-tex-surfaces
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_gen_mipmap.c