From: Brian Paul <brianp@vmware.com>
Date: Thu, 24 Sep 2009 17:03:16 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9f7a23ef05adfd2ebae56ee9f1b19897a589831;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/dri/r600/r700_assembler.c
	src/mesa/drivers/dri/r600/r700_chip.c
	src/mesa/drivers/dri/r600/r700_render.c
	src/mesa/drivers/dri/r600/r700_vertprog.c
	src/mesa/drivers/dri/r600/r700_vertprog.h
	src/mesa/drivers/dri/radeon/radeon_span.c
---

c9f7a23ef05adfd2ebae56ee9f1b19897a589831