projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05bad19 d39fd9f)
Merge branch 'mesa_7_6_branch'
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:03:23 +0000 (12:03 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:03:23 +0000 (12:03 -0700)
Conflicts:
Makefile
src/mesa/main/version.h


Trivial merge