Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Sat, 15 Nov 2008 16:53:24 +0000 (16:53 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Sat, 15 Nov 2008 16:53:24 +0000 (16:53 +0000)
commit7468765b18be202a64d58b83f6267b6973ea4897
tree6e9fa6dd4a2ff79787bcae247377d07c00a036cf
parent5e1454a036be6da2c48e2e20bf6f8047ee1a94d3
parent80d6379722a1249ce13db79a898d340644936f67
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/shader/prog_print.c
progs/xdemos/Makefile
src/mesa/shader/prog_print.c
src/mesa/shader/prog_print.h