Merge branch 'r500test' of git://people.freedesktop.org/~airlied/mesa into r500test
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 2 May 2008 19:15:44 +0000 (12:15 -0700)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 2 May 2008 19:15:44 +0000 (12:15 -0700)
commit9a82fde43aaaeab4370126d549aee8061b3a6937
tree858c48dc680838e787227492ddd6c9664a4cedb8
parentb15c49e59bdc149b978d2b35a4efcc99d15f16b2
parenteff6f1203222a776c5990b5d104b57a7f69b9aab
Merge branch 'r500test' of git://people.freedesktop.org/~airlied/mesa into r500test

Conflicts:

src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/r300/r500_fragprog.h
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/r300/r500_fragprog.h
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c