projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53f8dcc 6af783b)
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)
Need this to pick up fixes for per-vertex materials.

1  2 
progs/trivial/Makefile patch | diff1 | diff2 | blob | history
src/mesa/vbo/vbo_exec_draw.c patch | diff1 | diff2 | blob | history

diff --cc progs/trivial/Makefile
Simple merge
diff --cc src/mesa/vbo/vbo_exec_draw.c
Simple merge