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)
Conflicts:

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

1  2 
src/mesa/vbo/vbo_exec_api.c

Simple merge