projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a96fe67 93a95ad)
Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:51:45 +0000 (00:51 +0100)
committerChristian König <deathsimple@vodafone.de>
Tue, 11 Jan 2011 23:51:45 +0000 (00:51 +0100)
Conflicts:
src/gallium/drivers/r600/r600_shader.c


Trivial merge