Merge commit 'origin/gallium-0.1'
authorKeith Whitwell <keithw@vmware.com>
Tue, 3 Mar 2009 11:51:14 +0000 (11:51 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 3 Mar 2009 11:51:14 +0000 (11:51 +0000)
commit916de35d677ca5238e9515840fa5aa9f81302c5b
tree73a8a2443c3de43d253a38528335e39b40b391dc
parent72cf6e8e92e49753472e760b1cf4575327b48f43
parent2785af803f7d6d64ff17c10645e5f10499289ed0
Merge commit 'origin/gallium-0.1'

Conflicts:

scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/include/pipe/p_defines.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/include/pipe/p_defines.h
src/mesa/main/dd.h
src/mesa/state_tracker/st_cb_bufferobjects.c
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
src/mesa/vbo/vbo_save.h
src/mesa/vbo/vbo_save_api.c