Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa...
authorEric Anholt <eric@anholt.net>
Thu, 5 Jul 2007 18:36:44 +0000 (11:36 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 5 Jul 2007 18:36:44 +0000 (11:36 -0700)
commit3cf20ddbfc9d3a1dad4c058050595c54589257d3
tree57de53410bb0fb40979eed20d3c80d4c0ed68664
parent2ac17c68e2d64260168a54a275e839775828f534
parent4fe48b4e8568896cdbc822323aeec0a41c72ff2a
Merge branch 'i915-unification' of git+ssh://people.freedesktop.org/~anholt/mesa into i915-unification
src/mesa/drivers/dri/common/dri_bufmgr_fake.c
src/mesa/drivers/dri/common/dri_bufmgr_ttm.c
src/mesa/drivers/dri/i915tex/intel_screen.c