| commit | 1f196b786d6bd0c6a5dbdc638574ff716cc3d4de | [log] [tgz] |
|---|---|---|
| author | Brian Paul <brianp@vmware.com> | Wed Oct 28 21:24:11 2009 -0600 |
| committer | Brian Paul <brianp@vmware.com> | Wed Oct 28 21:24:11 2009 -0600 |
| tree | 5ae2753b99070f8b35c51576bd39e52df63879d6 | |
| parent | 0ea575d721821262a862ceef010db9b1a8b4a6d9 [diff] | |
| parent | 086f9fc0e2aef27f54eda87c733685500555bf20 [diff] |
Merge branch 'texformat-rework' Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c