projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 120b55a 3c5e741)
Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 21 May 2011 14:43:12 +0000 (16:43 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 21 May 2011 14:43:12 +0000 (16:43 +0200)
1  2 
configs/autoconf.in patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history
src/gallium/winsys/r600/drm/r600_bo.c patch | diff1 | diff2 | blob | history

diff --cc configs/autoconf.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/gallium/winsys/r600/drm/r600_bo.c
Simple merge