From: Michel Dänzer <daenzer@vmware.com>
Date: Tue, 30 Mar 2010 10:01:31 +0000 (+0200)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829;p=mesa.git

Merge branch '7.8'

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

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

e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829