r600g: some merge fixes
authorChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 22:59:58 +0000 (00:59 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 22:59:58 +0000 (00:59 +0200)
commit129a3c1cf0f9174d32db022b970ffb2127450ff9
treec568549be765fdc5cddb50306d6232ff35cd083d
parent1eb957bb4108123bea95b818e0544e3b5f255e08
r600g: some merge fixes
src/gallium/drivers/r600/eg_state_inlines.h
src/gallium/drivers/r600/r600_state_inlines.h