diff options
| author | Michel Dänzer <[email protected]> | 2009-02-18 16:43:02 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2009-02-18 16:43:02 +0100 |
| commit | 3bd7c5ceffc88a052c5e8e114df2f2c7549ddb4a (patch) | |
| tree | bdb352609c3ef21875a2699428e26b8c8c930f73 /src/gallium/drivers/r300/r300_emit.c | |
| parent | 76d8951fd3adbb91b2f71d461eec0f304619ca0b (diff) | |
| parent | b89aa1d87ad6cebdbb3f2067863c600f50bf0ff1 (diff) | |
Merge branch 'gallium-texture-transfer'
Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
0 files changed, 0 insertions, 0 deletions