projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b57abd3 75ad099)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:27:24 +0000 (18:27 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:27:24 +0000 (18:27 -0800)
Conflicts:
scons/gallium.py
scons/generic.py
src/mesa/main/version.h


Trivial merge