Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Tue, 27 Apr 2010 14:34:06 +0000 (08:34 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 27 Apr 2010 14:34:06 +0000 (08:34 -0600)
commit7567f05199f1ca114cc57e3a11ac101d3707f819
treeb8deb5a1e6d9480e533975cce095dcfbbf04e2bc
parentdb14a8022a2a957c83b1fe33a84af3cdb1952d68
parentea373df069aa734b4f59a5fbdbc304477a3613a0
Merge branch '7.8'

Conflicts:

src/gallium/drivers/nv30/nv30_context.c
src/gallium/drivers/nv40/nv40_context.c
src/gallium/drivers/nv40/nv40_state_emit.c