| commit | 7dd2d2ff7b6c7ba77139b5f8ad0b8a8cfb412f54 | |
| author | Dave Airlie <airlied@redhat.com> | |
| Fri, 20 Mar 2009 00:52:17 +0000 (20 10:52 +1000) | ||
| committer | Dave Airlie <airlied@redhat.com> | |
| Fri, 20 Mar 2009 00:52:17 +0000 (20 10:52 +1000) | ||
| tree | 03dcac05d7e18b2ac2f9ca63bbc0d1c27056f79b | treesnapshot (tar.gz zip) |
| parent | 1bf72d101fd2df4c4beb3a799786121948594404 | commitdiff |
| parent | f9924928a5277bfcc71afe04cde074098acb4d5a | commitdiff |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
| configs/autoconf.in | diff1 | diff2 | blobhistory |
| configure.ac | diff1 | diff2 | blobhistory |