projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c25ac5 7f3d6e7)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jul 2008 04:05:22 +0000 (14:05 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Wed, 23 Jul 2008 04:05:22 +0000 (14:05 +1000)
1  2 
configs/default patch | diff1 | diff2 | blob | history
configs/linux-dri patch | diff1 | diff2 | blob | history

diff --cc configs/default
Simple merge
diff --cc configs/linux-dri
Simple merge