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)
commit3e0797f3b702a1363bf238eb4826385860346137
treedc82d5b881dd6b892ebaf33b7a9239003ebb9530
parent635e96471218d5ada3fa7930fc1a746ec2aa4423
parente49ec6e2a4b5002ac9766c828807fb0a10d975f2
Merge branch 'r300-vertprog-branch' of ssh://people.freedesktop.org/~z3ro/mesa
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c