Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 5 Nov 2009 00:57:20 +0000 (17:57 -0700)
committerBrian Paul <brianp@vmware.com>
Thu, 5 Nov 2009 00:57:20 +0000 (17:57 -0700)
commit898de4a9d5e47ed32c600e5907476fd9338aa7e9
treeb06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec
parentfe86f8d73268785b31bc8d5a278a233bff42034d
parent1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96
Merge branch 'mesa_7_6_branch'

Conflicts:

src/mesa/drivers/windows/gdi/mesa.def
src/mesa/drivers/windows/gdi/mesa.def
src/mesa/main/get.c
src/mesa/main/get_gen.py
src/mesa/main/histogram.c
src/mesa/vbo/vbo_exec.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
windows/VC8/mesa/mesa/mesa.vcproj