Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Sat, 1 Nov 2008 22:57:26 +0000 (22:57 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Sat, 1 Nov 2008 22:57:26 +0000 (22:57 +0000)
commit81c862205e32b163a9f5ecf3f59e4cdcccee36c6
tree50a5f45f1a0823758e72968d1f1dfd6e0d1098e0
parent14e1505cce24ee294cb98683504cc4537c20f34a
parentbbffed0857634912c7a1f13882eba303ae2bf4e1
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Makefile
src/mesa/main/mtypes.h
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_link.c