Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Mon, 22 Mar 2010 15:07:46 +0000 (09:07 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 22 Mar 2010 15:07:46 +0000 (09:07 -0600)
commit182c42c8da6edfa66819eef02f4dea310c1f68d7
treef49df694eae81c9db3c8fe2123bb30ef5a556891
parent5cb4a3524b54480418b4c4717c4a0f0a8669939c
parentca97f8b9bab80844be613a9253643b7da8e738c7
Merge branch '7.8'

Conflicts:

src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c