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)
1  2 
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/include/pipe/p_defines.h

Simple merge