projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18fe977 0a79c65)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 23:01:59 +0000 (10:01 +1100)
committerBen Skeggs <skeggsb@gmail.com>
Mon, 10 Dec 2007 23:01:59 +0000 (10:01 +1100)
Conflicts:

src/mesa/drivers/dri/Makefile.template


Trivial merge