Merge branch 'r300-swtcl'
authorDave Airlie <airlied@linux.ie>
Sun, 1 Jul 2007 08:50:14 +0000 (18:50 +1000)
committerDave Airlie <airlied@linux.ie>
Sun, 1 Jul 2007 08:50:14 +0000 (18:50 +1000)
commitf556b7f84c47d9b32d7daa3e1559c92e47305eb2
tree5ccd842445b69844ef70b6ae80c10ff0eee7cbbd
parentf4b103dc993491355ec3e3640d9cb060138175c2
parent646ed82e6b2c092c6db364bf87d6881f39e83eec
Merge branch 'r300-swtcl'
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_state.c