R300: fix rebase conflicts
authorAlex Deucher <alex@botch2.com>
Fri, 2 May 2008 19:20:28 +0000 (15:20 -0400)
committerAlex Deucher <alex@botch2.com>
Fri, 2 May 2008 19:20:28 +0000 (15:20 -0400)
commitae09292a6e659eabc566a0fc2b1f6fa5e5fd8b36
treecf004ee3236ab7fbcf67dba78ce8c9fede882024
parent9e7ae34da5aeb9a38c3f4280f6d9648faad48df5
R300: fix rebase conflicts
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c