From: Dave Airlie <airlied@redhat.com>
Date: Thu, 8 Apr 2010 06:48:41 +0000 (+1000)
Subject: Merge remote branch 'origin/7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dff50ff592da7cb1d784fae794dd1647a5445bca;p=mesa.git

Merge remote branch 'origin/7.8'

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

dff50ff592da7cb1d784fae794dd1647a5445bca