diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-21 22:03:25 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-21 22:03:25 +0000 |
| commit | 575b35ee6b683d77095ef21c573c1de207107e79 (patch) | |
| tree | 7a41e0969fa01883c0186dc7dd3b00719e17cfbf /src/gallium/drivers/svga | |
| parent | f29ac73f3f626d5779a627b7fa6fecdb60a35aab (diff) | |
| parent | 9fc6c8b831e5b43ae86ece6a531fc892f6f66356 (diff) | |
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/winsys/drm/radeon/core/radeon_buffer.h
Diffstat (limited to 'src/gallium/drivers/svga')
0 files changed, 0 insertions, 0 deletions