Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 10 Sep 2008 20:09:05 +0000 (06:09 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 10 Sep 2008 20:09:05 +0000 (06:09 +1000)
commit7158203b081ad34c03382f07e0df748eae235e9b
treeee61efebbafb5464ec090c21b5e05533588789a1
parent02025148c28d03d644e3d66dde1a423fe21e1c44
parenteb5b16d278e0f7ee0121049e43dfee1d52f2b0f7
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:
configs/default
configs/default
configs/linux-dri
src/gallium/auxiliary/draw/draw_context.c