r300g: fix up after merge
authorKeith Whitwell <keithw@vmware.com>
Mon, 15 Mar 2010 10:24:55 +0000 (10:24 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 15 Mar 2010 10:24:55 +0000 (10:24 +0000)
commit506130fff5685742d280bde8800be036c8e8ebfa
treefbfa5afedf1a6d3b18051f5c278dcecc2baa07db
parent42910ebe7b9748c0ecb6a597bae3e7d43c7e170f
r300g: fix up after merge
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_state_derived.c