| commit | f37c05e4cebd64f7a28a924477df0e05046239b6 | |
| author | Dave Airlie <airlied@redhat.com> | |
| Thu, 9 Apr 2009 00:14:35 +0000 (9 10:14 +1000) | ||
| committer | Dave Airlie <airlied@redhat.com> | |
| Thu, 9 Apr 2009 00:31:08 +0000 (9 10:31 +1000) | ||
| tree | 4332db988c0c5b23977a59ff07f08b895667c521 | treesnapshot (tar.gz zip) |
| parent | 7c8e3c9618b6c508cde2c511ce52f627080fb7ec | commitdiff |
| parent | 69acb5e1c2e234ca8dc2f78f6495bbd149c009eb | commitdiff |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
| configure.ac | diff1 | diff2 | blobhistory |