Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 Jan 2010 23:09:03 +0000 (16:09 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 22 Jan 2010 23:09:03 +0000 (16:09 -0700)
commit7b5ad23c7f7f9016f725cb1caa3cf8971aeedbc8
tree5a31fa4eb2227654eb07ebdce1a954233fe4bc19
parentd88b219cf37c488f57e18850c843078ff918b55d
parent099e8ec54d4f7b9cd9ae3a481d6a6ae60f4590be
Merge branch 'mesa_7_7_branch'

Conflicts:

src/mesa/shader/prog_execute.c
src/gallium/winsys/xlib/xlib_softpipe.c
src/mesa/shader/prog_execute.c