Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
authorJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 13:52:51 +0000 (14:52 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 13:52:51 +0000 (14:52 +0100)
commit0c75854cc1650dc870e042aa66a053e70b3d4556
tree72eb2c040bd10b6210bdc7f2b25df5e8c405095f
parent4598942b1b88a2a7d5af7febae7e79eedf00e385
parent2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
src/mesa/main/version.h
src/mesa/drivers/dri/intel/intel_extensions.c
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r200/r200_state_init.c