Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 18 Sep 2008 18:06:20 +0000 (19:06 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 18 Sep 2008 18:07:33 +0000 (19:07 +0100)
commita8d1521f30766b6a4707aa9966e1f2f9c0b3ac00
tree3d457d02a4d6167c2b720f8b55a59a32f33aaed9
parent89ab66448e1bcd78caab6678261c2885dcff741c
parent0b8e19ffc51c29543796d4f1e3243e97d8c32671
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/mesa/shader/slang/slang_link.c
progs/fp/fp-tri.c
src/mesa/main/mtypes.h
src/mesa/shader/slang/slang_link.c
src/mesa/vbo/vbo_context.c