projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6be2bc5 7549a83)
Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 17:03:16 +0000 (11:03 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 17:03:16 +0000 (11:03 -0600)
Conflicts:

src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_chip.c
src/mesa/drivers/dri/r600/r700_render.c
src/mesa/drivers/dri/r600/r700_vertprog.c
src/mesa/drivers/dri/r600/r700_vertprog.h
src/mesa/drivers/dri/radeon/radeon_span.c

1  2 
src/gallium/auxiliary/tgsi/tgsi_sse2.c patch | diff1 | diff2 | blob | history