projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b03996 38c8b03)
Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:12:24 +0000 (21:12 +0100)
committerChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:12:24 +0000 (21:12 +0100)
1  2 
src/gallium/drivers/r600/r600_shader.c patch | diff1 | diff2 | blob | history
src/gallium/drivers/r600/r600_state.c patch | diff1 | diff2 | blob | history

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