Merge commit 'origin/master' into gallium-msaa
authorRoland Scheidegger <sroland@vmware.com>
Fri, 30 Apr 2010 13:27:13 +0000 (15:27 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Fri, 30 Apr 2010 13:27:13 +0000 (15:27 +0200)
commit7662e3519bef3802024da3050b886068281e02b1
treebc5bf675e67febffaf9e4d1fadd139e8c253ae32
parent9a966b93c03aecac8eb72e6133aa9a2f2c7673f3
parent7c769bef052fc1936d7ab33e291bb4646dc5b0d1
Merge commit 'origin/master' into gallium-msaa
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/include/pipe/p_defines.h