Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 28 Jul 2009 14:58:25 +0000 (08:58 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 28 Jul 2009 14:58:25 +0000 (08:58 -0600)
commitd2f6d6ce49699d35d6b6a234fe17a27d99f4b267
tree22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa
parent94726bc69e5f9dbefb34a38695f2f51d81ff433f
parentbc60b884110b9e41ee3082075717587cc38380b5
Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
Makefile
docs/relnotes.html
progs/trivial/.gitignore
src/mesa/drivers/dri/intel/intel_screen.c