From: Brian Paul <brianp@vmware.com>
Date: Tue, 22 Dec 2009 01:35:54 +0000 (-0700)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9eb7fc6661a1d46c06cec8584b898e3e690af6fa;p=mesa.git

Merge branch 'mesa_7_7_branch'

Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
---

9eb7fc6661a1d46c06cec8584b898e3e690af6fa