projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78faf8d 8af583f)
Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Fri, 21 Jan 2011 20:51:24 +0000 (21:51 +0100)
committerChristian König <deathsimple@vodafone.de>
Fri, 21 Jan 2011 20:51:24 +0000 (21:51 +0100)
Conflicts:
src/gallium/drivers/r600/r600_texture.c

1  2 
src/gallium/drivers/r600/r600_asm.c patch | diff1 | diff2 | blob | history

diff --cc src/gallium/drivers/r600/r600_asm.c
Simple merge