projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 522139d 81335d0)
Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:37:33 +0000 (20:37 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:37:33 +0000 (20:37 +1000)
Conflicts:
configs/linux-dri

1  2 
configs/default patch | diff1 | diff2 | blob | history

diff --cc configs/default
Simple merge