From: Pauli Nieminen <suokkos@gmail.com>
Date: Wed, 17 Mar 2010 09:26:48 +0000 (+0200)
Subject: Merge branch '7.8' into master
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0f04cd12db156ec53b7ea46fae27199af121f90;p=mesa.git

Merge branch '7.8' into master

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

f0f04cd12db156ec53b7ea46fae27199af121f90