Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@vmware.com>
Thu, 22 Jan 2009 09:43:42 +0000 (09:43 +0000)
committerAlan Hourihane <alanh@vmware.com>
Thu, 22 Jan 2009 09:43:42 +0000 (09:43 +0000)
commit4df482086ebf0663c708b089d8d8d22de0ef972c
treee802cc36b266bfdeb80ab9e55643c50f5a5e6d9c
parent01cbd764962ff49bf104e5997914ced53360ef81
parentb8bd0b0ddc357f9b430bb6ddeb60c5a2179d3791
Merge commit 'origin/master' into gallium-0.2

Conflicts:
windows/VC8/mesa/osmesa/osmesa.vcproj
windows/VC8/progs/demos/gears.vcproj
windows/VC8/progs/progs.sln
Makefile
progs/tests/Makefile
src/mesa/drivers/dri/common/dri_util.h
src/mesa/main/enable.c
src/mesa/main/texformat.c
src/mesa/main/texformat.h
src/mesa/main/texformat_tmp.h
src/mesa/main/texstore.c
src/mesa/main/texstore.h