Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 22:06:21 +0000 (16:06 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 22:06:21 +0000 (16:06 -0600)
commit29d27229a95837d085db785a2b4abb654457dafa
tree0a03c9dbe3e55fa9676137750da1ee465379b978
parentfd56bee6c4de28da194333f93b52c40f1deb6163
parent940ca2e837efe45caae1cf1d9665f6736347705d
Merge branch 'mesa_7_6_branch'

Conflicts:

src/mesa/vbo/vbo_exec_array.c
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/drivers/dri/intel/intel_generatemipmap.c
src/mesa/main/enable.c
src/mesa/main/mtypes.h
src/mesa/vbo/vbo_exec_array.c