Merge commit 'origin/master' into HEAD
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 26 Sep 2008 13:09:04 +0000 (14:09 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 26 Sep 2008 13:09:04 +0000 (14:09 +0100)
commitfb8db63a89c4ac7fbbbc0912e1dde0871ae9c35c
tree3d6f43bc2b9bc977216e0d8b67ea9976854d3c8c
parentbb6a69d1696cacf828a3de21bc57678c0e4aa54a
parent1e3a44fab068f00378613456036716d0c3772969
Merge commit 'origin/master' into HEAD

Conflicts:

src/mesa/vbo/vbo.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_exec_draw.c
src/mesa/vbo/vbo_exec_api.c