Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
authorPauli Nieminen <suokkos@gmail.com>
Mon, 24 Aug 2009 23:36:13 +0000 (02:36 +0300)
committerPauli Nieminen <suokkos@gmail.com>
Mon, 24 Aug 2009 23:36:13 +0000 (02:36 +0300)
commitce7ed63f0c2f5cb1c030f73a5d8f6544eaac0f81
tree7554a2723fabb39037101724e5f179b70bb5a948
parent4297f32c246cc5b726d02745456c06952322958d
parent1d5a06a1f7812c055db1d724e40d21a0e3686dd1
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/r300/r300_context.h
src/mesa/drivers/dri/r600/r700_render.c