projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa1a790 07c6d94)
Merge branch '7.8'
authorMichel Dänzer <daenzer@vmware.com>
Tue, 30 Mar 2010 10:01:31 +0000 (12:01 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Tue, 30 Mar 2010 10:01:31 +0000 (12:01 +0200)
Conflicts:
Makefile
src/mesa/main/version.h

Resolved by keeping version strings from master (also in the intel driver).


Trivial merge