Merge branch '7.8'
authorMichel Dänzer <daenzer@vmware.com>
Fri, 26 Mar 2010 17:42:16 +0000 (18:42 +0100)
committerMichel Dänzer <daenzer@vmware.com>
Fri, 26 Mar 2010 17:42:16 +0000 (18:42 +0100)
commitfeb619b7705897ca723e8fe728f739932f743327
tree9c972bf3d54efd9476233a17202124eac2ac4ae6
parent3ae082f00cad3f2323a3747fe3b6f02b8f8c5285
parent7996f0fc2c167c84552701be7a48d20a897e7978
Merge branch '7.8'

Conflicts:
src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master
src/mesa/drivers/dri/swrast/swrast_span.c
src/mesa/drivers/dri/swrast/swrast_spantemp.h