Merge commit 'origin/gallium-0.1' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Mon, 10 Nov 2008 18:19:30 +0000 (11:19 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Mon, 10 Nov 2008 18:19:30 +0000 (11:19 -0700)
commit2b66417402bc595be301ab9ed7b9ea2a5f79e180
tree32ec9363dc065d41a1efc72e57ebb44cf333f598
parent399da3a337932c6074a69ac73e711138271308eb
parenteb4dded5be60af4c7d45394aaa0aca24549ec3d8
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/util/u_math.c
src/gallium/auxiliary/util/p_debug.c