Merge commit 'origin/gallium-0.1'
authorJosé Fonseca <jfonseca@vmware.com>
Tue, 3 Mar 2009 12:26:21 +0000 (12:26 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Tue, 3 Mar 2009 12:26:21 +0000 (12:26 +0000)
commitdceb09909ea9d6eaef0334897ebed6da45db6faa
treedcaa2385ae077c77e3be992cd9c83598591577f4
parentefcea15aaaaa4f1431a8c0a8521bd42a953f2e6c
parent9036e0d724dcefb7e15d9cc2020a25f87c93a04d
Merge commit 'origin/gallium-0.1'

Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c