Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:30:22 +0000 (16:30 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:30:22 +0000 (16:30 +1100)
commit87e3301533aa4d3e6e98db139887ebba3d217f7d
treead80803f8f90263ea4c9adf9b3e7dd8eae4b05fa
parent49405c43f245d3b3ddd12e891413bf7ead23145c
parent3320b1874e810583f95b93a89697b2955987b84f
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

Conflicts:

configs/linux-dri
src/mesa/pipe/Makefile