Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 14 Aug 2009 17:27:51 +0000 (11:27 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 14 Aug 2009 17:27:51 +0000 (11:27 -0600)
commitd09a19bf6e09eb0c8908e9b5378962ac17bcbc4c
treedde75617a85679ebd80b3d86e7f2889203c8da24
parentdb598b899868ba6db8f3f525a22a45331589592e
parent1574b05189fee1b5802024b505ba93fff345e95c
Merge branch 'mesa_7_5_branch'
src/mesa/main/dlist.c
src/mesa/main/light.c
src/mesa/shader/shader_api.c