Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:20:40 +0000 (16:20 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:20:40 +0000 (16:20 +1100)
commit49405c43f245d3b3ddd12e891413bf7ead23145c
treec6969454265b133f6be8c04b2ba193aecf90e4a7
parent263de4b814eb78cc971ad28f173985b61b77465c
parent4d9c19d2f7eef263b49485b6e65be9afbe58363a
Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1

Conflicts:

src/mesa/pipe/nouveau/nouveau_stateobj.h
src/mesa/pipe/nv40/nv40_context.c
src/mesa/pipe/nv40/nv40_miptree.c