Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 29 Sep 2009 15:46:49 +0000 (09:46 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 29 Sep 2009 15:46:49 +0000 (09:46 -0600)
commit124f5875eae0b914d5c679fec6b25633907ad843
treefcacb16e4b09a320130eb23d1d20662f1f380a62
parent170bd0c8827f6f65c7bfa5a7fb68ba0678ed57ba
parent69a3043f4109463f35e87102e509e0a4599cd09a
Merge branch 'mesa_7_6_branch'

Conflicts:

Makefile
configs/default
docs/relnotes.html
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/mesa/main/version.h
docs/relnotes.html
src/gallium/drivers/softpipe/sp_tile_cache.c
src/mesa/main/texstate.c