Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
authorPauli Nieminen <suokkos@gmail.com>
Sun, 23 Aug 2009 21:57:05 +0000 (00:57 +0300)
committerPauli Nieminen <suokkos@gmail.com>
Sun, 23 Aug 2009 21:57:05 +0000 (00:57 +0300)
commit7bb0f880dbdee0c57693c3a1f331d7c0894e71e1
treec46a42d33501c1a9d56596981f50ce98746aa040
parenteffda2e2a7f8ef7406d698c6b31dbbff408ed112
parent4484ce9c7b196a686a3928f7e29dc8d9b6f3cae3
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict

Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_draw.c
src/mesa/drivers/dri/r300/r300_render.c
src/mesa/drivers/dri/radeon/radeon_dma.c
src/mesa/drivers/dri/radeon/radeon_state_init.c