Merge commit 'origin/gallium-0.1' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 15 Dec 2008 11:22:19 +0000 (11:22 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 15 Dec 2008 11:22:19 +0000 (11:22 +0000)
commit8abc860bd46a6cd584f9a64cb4613be76f82db06
tree25b94d69e8ef1198cd45b2d5fc0a6fde196124de
parenta22d865f93a1db7f72e0bfe216810f67bf4c2f2c
parent3a5d260cb1d2602b9fc32392f18538d0a6ff41c2
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/winsys/gdi/SConscript
common.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_clear.c
src/mesa/state_tracker/st_draw.c
src/mesa/state_tracker/st_mesa_to_tgsi.c