Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@vmware.com>
Wed, 14 Jan 2009 23:33:41 +0000 (23:33 +0000)
committerAlan Hourihane <alanh@vmware.com>
Wed, 14 Jan 2009 23:33:41 +0000 (23:33 +0000)
commit658b1bdb1cc5f9910be910dc156a2e81ed999756
tree98d15bcf83b662dd8c7186dd423e3d8ebbd87f1c
parente82784559e00cb534993c01309ad1832e9b3e56b
parent03188b09e071ace9d9e21ccc56c01e90c0fa8639
Merge commit 'origin/master' into gallium-0.2

Conflicts:
docs/install.html
docs/relnotes-7.3.html
src/mesa/shader/slang/slang_codegen.c
src/mesa/shader/slang/slang_compile.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_preprocess.c
src/mesa/shader/slang/slang_preprocess.h
Makefile
src/mesa/glapi/glthread.h
src/mesa/main/glheader.h
src/mesa/main/light.c
src/mesa/main/mtypes.h
src/mesa/shader/arbprogparse.c
src/mesa/shader/slang/slang_compile.c
src/mesa/shader/slang/slang_preprocess.c