Merge branch 'gallium-0.1' into gallium-tex-surfaces
authorBrian Paul <brian.paul@tungstengraphics.com>
Sun, 18 May 2008 22:17:50 +0000 (16:17 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Sun, 18 May 2008 22:17:50 +0000 (16:17 -0600)
commit54fbd8bbd4e5a484d59907bae852908e3a8b8f3c
tree2e45fac3c2505fe1131ed38e45110e1319f49806
parentb4219e35e2de783ca03e53c311a8a56f8b633aa1
parenta0bfeb0c3ca58a1f4d978f2aaa343ed4009de079
Merge branch 'gallium-0.1' into gallium-tex-surfaces
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_readpixels.c
src/mesa/state_tracker/st_cb_texture.c