From: Brian Paul <brianp@vmware.com>
Date: Tue, 27 Apr 2010 14:34:06 +0000 (-0600)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7567f05199f1ca114cc57e3a11ac101d3707f819;p=mesa.git

Merge branch '7.8'

Conflicts:

	src/gallium/drivers/nv30/nv30_context.c
	src/gallium/drivers/nv40/nv40_context.c
	src/gallium/drivers/nv40/nv40_state_emit.c
---

7567f05199f1ca114cc57e3a11ac101d3707f819