Merge commit 'origin/gallium-0.1' into gallium-0.2
authorJosé Fonseca <jfonseca@vmware.com>
Mon, 22 Dec 2008 19:31:52 +0000 (19:31 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Mon, 22 Dec 2008 19:31:52 +0000 (19:31 +0000)
commit9136c9b29ed5c14bc89a4c4e3a391e0b097092e1
tree75268d994baf85d58b4542124862189f44645c06
parentce8469abeb8d48d84a77f3ddd1664d9f98d7d620
parent5f36c5b2c59bb8be53d3712b3896b448ef086c74
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/util/Makefile
progs/trivial/.gitignore
src/gallium/auxiliary/util/Makefile
src/gallium/auxiliary/util/SConscript
src/gallium/auxiliary/util/u_memory.h