Merge remote branch 'origin/gallium-st-api'
authorChia-I Wu <olv@lunarg.com>
Tue, 16 Mar 2010 07:12:46 +0000 (15:12 +0800)
committerChia-I Wu <olv@lunarg.com>
Tue, 16 Mar 2010 07:12:46 +0000 (15:12 +0800)
commit9d3a873f425fde83628b547c4b4638f39d78c1b9
tree890dce800787f2a896554c96064eb51f0138950b
parent95d43bccde9ba5c0727bb2b9e52d050dacfa0cfa
parenta66d0081044bfcbfbe72ecbc27692387e4716e5c
Merge remote branch 'origin/gallium-st-api'
src/gallium/state_trackers/dri/dri_context.c
src/gallium/state_trackers/glx/xlib/Makefile
src/gallium/targets/libgl-xlib/xlib.c
src/mesa/SConscript
src/mesa/sources.mak
src/mesa/state_tracker/st_cb_readpixels.c