Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
authorKeith Whitwell <keithw@vmware.com>
Tue, 30 Jun 2009 15:28:37 +0000 (16:28 +0100)
committerKeith Whitwell <keithw@vmware.com>
Tue, 30 Jun 2009 15:28:54 +0000 (16:28 +0100)
commit4147bb24d49a10498e00039fc1dc9aa5f1316777
treeceb027c40f52dd7e0471a3534bac7cd270b6953b
parent53f8dccd0c9ab0b55e24dd5d624bbaaf0c8c284b
parent6af783bea0e171582f86c8456ca521ac242abc39
Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit

Need this to pick up fixes for per-vertex materials.
progs/trivial/Makefile
src/mesa/vbo/vbo_exec_draw.c