| commit | 7bb0f880dbdee0c57693c3a1f331d7c0894e71e1 | [log] [tgz] |
|---|---|---|
| author | Pauli Nieminen <suokkos@gmail.com> | Mon Aug 24 00:57:05 2009 +0300 |
| committer | Pauli Nieminen <suokkos@gmail.com> | Mon Aug 24 00:57:05 2009 +0300 |
| tree | c46a42d33501c1a9d56596981f50ce98746aa040 | |
| parent | effda2e2a7f8ef7406d698c6b31dbbff408ed112 [diff] | |
| parent | 4484ce9c7b196a686a3928f7e29dc8d9b6f3cae3 [diff] |
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