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)
commite5c7d1e1c8ccb493c63e33d017c28b5cf4a55829
tree0c73ae897b0cfb09ad21e13e27f45bb11b82e75b
parentaa1a79036003c2aeaae24877da66e9b46a059cad
parent07c6d94cd7272524ef06b2a787667e5d626137d2
Merge branch '7.8'

Conflicts:
Makefile
src/mesa/main/version.h

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