Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 15:15:54 +0000 (08:15 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 6 Jan 2009 15:15:54 +0000 (08:15 -0700)
commit374cf77b2f0f13f9380fb0c9d804222a83bdc2e0
tree39cfbbcbbbdc9b2d64e4ad134472cf747101dc7b
parent52d5d25537a9291f7d247211d2881ed56edaca94
parenta8ee35c1c59c23938e0a18b163515acc892ed407
Merge commit 'origin/master' into gallium-0.2

Conflicts:

src/mesa/drivers/dri/common/dri_util.c
Makefile
src/mesa/main/texformat.c