Merge branch 'r500-support' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa...
authorAlex Deucher <alex@botch2.com>
Mon, 12 May 2008 15:58:35 +0000 (11:58 -0400)
committerAlex Deucher <alex@botch2.com>
Mon, 12 May 2008 15:58:35 +0000 (11:58 -0400)
1  2 
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_reg.h

Simple merge