Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 9 Jun 2009 05:53:25 +0000 (07:53 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Tue, 9 Jun 2009 05:53:25 +0000 (07:53 +0200)
commitee98ae5a29ca870149c4a0d2a8f25f55e0fd333a
tree308fa87e22a276c0f8f28fd9f0986d20b52be928
parentd9617deb008b75f4a605a30408aeb1948139c33e
parent76a1017e978f8e51114d765c8c98ff25da13042b
Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
configure.ac
progs/tests/Makefile
src/mesa/main/config.h
src/mesa/main/debug.c
src/mesa/shader/arbprogparse.c
src/mesa/state_tracker/st_cb_bufferobjects.c
src/mesa/vbo/vbo_exec_api.c