Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
authorPauli Nieminen <suokkos@gmail.com>
Mon, 24 Aug 2009 14:09:27 +0000 (17:09 +0300)
committerPauli Nieminen <suokkos@gmail.com>
Mon, 24 Aug 2009 14:09:27 +0000 (17:09 +0300)
commit75da0a6a561e9cd0ab64494d10e6645c35d31e82
treeda08eec66d283ecc61493e2821cb905c1990ddfd
parentfe42b4b7577feb5a0f10be2faf34da191e34c135
parented14a4cb7bbcef45668a3ab6fe8efb267b7c4efd
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r600/r700_render.c