projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49405c4 3320b18)
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:30:22 +0000 (16:30 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Sat, 16 Feb 2008 05:30:22 +0000 (16:30 +1100)
Conflicts:

configs/linux-dri
src/mesa/pipe/Makefile


Trivial merge