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

1  2 
configs/autoconf.in patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configs/autoconf.in
Simple merge
diff --cc configure.ac
Simple merge