projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 635e964 e49ec6e)
Merge branch 'r300-vertprog-branch' of ssh://people.freedesktop.org/~z3ro/mesa
authorOliver McFadden <z3ro.geek@gmail.com>
Sat, 29 Mar 2008 14:46:32 +0000 (14:46 +0000)
committerOliver McFadden <z3ro.geek@gmail.com>
Sat, 29 Mar 2008 14:46:32 +0000 (14:46 +0000)
1  2 
src/mesa/drivers/dri/r300/r300_ioctl.c patch | diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_reg.h patch | diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_state.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/drivers/dri/r300/r300_reg.h
Simple merge