Merge remote branch 'origin/master' into nv50-compiler
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Thu, 2 Sep 2010 16:31:49 +0000 (18:31 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Thu, 2 Sep 2010 16:31:49 +0000 (18:31 +0200)
commit222d2f2ac2c7d93cbc0643082c78278ad2c8cfce
treeb79152c238022b2a901201c22e5809ac520732bf
parent443abc80db9e1a288ce770e76cccd43664348098
parente73c5501b2fe20290d1b691c85a5d82ac3a0431c
Merge remote branch 'origin/master' into nv50-compiler

Conflicts:
src/gallium/drivers/nv50/nv50_program.c
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_miptree.c
src/gallium/drivers/nv50/nv50_push.c
src/gallium/drivers/nv50/nv50_tex.c