Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 30 Jun 2009 14:56:53 +0000 (08:56 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 30 Jun 2009 14:56:53 +0000 (08:56 -0600)
commitb40dc7e7fcafc30ebaa3778ee847c8983987de83
treeb8ed89d7d8ba3fc2c25b3e2f95a62b1820557aac
parentb750b9fc3d12e4c23ef74181a6252e0e054a3985
parent4c31632817a0bde28ad6c9ee8032d838ce4b7bfb
Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/vbo/vbo_exec_draw.c
src/gallium/include/pipe/p_defines.h
src/mesa/state_tracker/st_cb_bufferobjects.c
src/mesa/vbo/vbo_exec_draw.c