Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Sat, 15 Nov 2008 16:23:31 +0000 (16:23 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Sat, 15 Nov 2008 16:23:31 +0000 (16:23 +0000)
commit5e1454a036be6da2c48e2e20bf6f8047ee1a94d3
tree660228843fc88f2e43d975921e7d4e078e483f1c
parent56ef0aeda5d23bf0c6147fd9d20d61abd18207af
parent7e584a70c492698be18bf4d6372b50d1a1c38385
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/mesa/drivers/dri/common/dri_util.c
progs/trivial/Makefile
src/gallium/auxiliary/util/u_math.h