Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 12 Sep 2008 09:31:23 +0000 (10:31 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 12 Sep 2008 09:31:23 +0000 (10:31 +0100)
commit176c454765b88c71d8b1ef474bc0fd53cb253a08
tree76a2aee9ab3ae7f94661faf305d1b7b7b82b5cb3
parent1f135456795adfb1d739a6fb66ab9540aa79b461
parentaa66f08a21b791f338b519f0c2162cd8f7b3aeb0
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

progs/fp/Makefile
progs/fp/Makefile
src/egl/drivers/dri/Makefile