Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 16:22:00 +0000 (09:22 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 16:22:00 +0000 (09:22 -0700)
commitb605f4ff11c894500f2d0273c5d4653ff413448d
tree144a2202677b29020bfb0477d145a985cae3c29f
parentda3bc492d2438ac915e720c17b54d0d12ffd8a97
parent5076a4f53a2f34cc9116b45951037f639885c7a1
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
src/mesa/drivers/dri/r600/r700_chip.c
src/mesa/main/light.c
src/mesa/main/texgen.c
src/mesa/main/texobj.c
src/mesa/main/texparam.c
src/mesa/shader/program.c