Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 23:01:59 +0000 (10:01 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 23:01:59 +0000 (10:01 +1100)
commitfe9f4f49ef1c86938f75ab598d63d9ddce850f32
tree530c340a5ac1aa43aacdfea49f4bb1b3ffe1bce9
parent18fe9776b4977af092582630b181893b2bc6de40
parent0a79c65073db7dbeb9a83e40a4516edcb4f25ee5
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

src/mesa/drivers/dri/Makefile.template