Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@vmware.com>
Fri, 16 Jan 2009 16:44:53 +0000 (16:44 +0000)
committerAlan Hourihane <alanh@vmware.com>
Fri, 16 Jan 2009 16:44:53 +0000 (16:44 +0000)
commit2e28c1fda24988241ef7abb91b7d896e38f5df26
tree593e70705d1f60babd77697b75f7618a94c6703b
parent47ca0234dc9f83808cb141944537c78eaade5d55
parente442fe5ba53acf16c78339f19921d70dba3928f6
Merge commit 'origin/master' into gallium-0.2

Conflicts:
src/mesa/shader/slang/slang_compile.c
Makefile
src/mesa/shader/slang/slang_link.c