Merge remote branch 'origin/nv50-compiler'
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Wed, 15 Sep 2010 15:34:40 +0000 (17:34 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Wed, 15 Sep 2010 15:34:40 +0000 (17:34 +0200)
commit26fe16a99b762d27e8f499c2e02116e9c4b7a6bb
tree153d15f0e24f349d2ba6ec736ed5e4b8b961e824
parent59ca1ae84b2c15c8a94211da158f563e45560bcd
parent84d170bbcef8e26017ac8e2f3bacbaeb20f889d3
Merge remote branch 'origin/nv50-compiler'

Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
src/gallium/drivers/nv50/nv50_formats.c
src/gallium/drivers/nv50/nv50_program.h
src/gallium/drivers/nv50/nv50_reg.h
src/gallium/drivers/nv50/nv50_screen.c