Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Sat, 18 Jul 2009 04:00:47 +0000 (22:00 -0600)
committerBrian Paul <brianp@vmware.com>
Sat, 18 Jul 2009 04:00:47 +0000 (22:00 -0600)
commitb96ae1b2c463d6d99ee0418083ef68f4027b7cd7
treef34f89c267b940eb7408475bd0c2ff57c7fbe992
parentf81f57e25db18b1c69f2f8076380603340fa2cda
parentcd10996d4f517c69e306eaf6dfb0654432651b3a
Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
progs/glsl/multitex.c
src/mesa/main/enums.c
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
progs/glsl/multitex.c
scons/gallium.py
src/mesa/main/attrib.c
src/mesa/main/mtypes.h