projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92a0e93 1226aba)
Merge branch 'r345-cleanup' of git://people.freedesktop.org/~agd5f/mesa into r500test
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 2 May 2008 22:57:57 +0000 (15:57 -0700)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Fri, 2 May 2008 22:57:57 +0000 (15:57 -0700)
commit568d369d7747c6cc2a421a816c85d888ccfc9957
tree15a449b4622fedb04c73a2c694074334eccd2da5tree
parent92a0e93ac33ceb64a4e7e930223950d4529cef37commit | diff
parent1226aba119c46c09ec6620dc0be29b63fb3440a7commit | diff
Merge branch 'r345-cleanup' of git://people.freedesktop.org/~agd5f/mesa into r500test
Adding Alex's cleanup patches. This adds r5xx TCL! Whoo-hoo!
Conflicts:

src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/r300/r300_state.c diff1 | diff2 | blob | history