Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Wed, 17 Mar 2010 16:13:51 +0000 (10:13 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 17 Mar 2010 16:13:51 +0000 (10:13 -0600)
commitef92fe85de114cb50ca4b3070d0594aade54526c
treeeb99edb4a122f87090cd53efd6e94620128f4d85
parentbf1974b37d6b92448b068dda8f8f4e9aab4dc537
parent1bfc314596256b039df59f751d59dac82e3ceba1
Merge branch '7.8'

Conflicts:

src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_drawpixels.c