Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Mon, 29 Oct 2007 20:24:27 +0000 (13:24 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 29 Oct 2007 20:24:27 +0000 (13:24 -0700)
commitb0edb9c38a6c63175e4fafdbb54102c4f4a94e2c
tree7dfa294a9c9f40f5f2e81a95dfd0d59cd4d6fbea
parent919f617d08a34d01dd916b08ca4f315bae84f21c
parentad8ee7db3b406b23136873fc8c87a22e4d8b94de
Merge branch 'origin'
src/mesa/drivers/dri/i965/Makefile