projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 968bf96 4b39a0d)
Merge remote branch 'origin/7.8'
authorDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2010 06:48:41 +0000 (16:48 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 8 Apr 2010 06:48:41 +0000 (16:48 +1000)
Conflicts:
Makefile
configs/default
src/mesa/main/version.h


Trivial merge