From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 9 Jun 2009 05:53:25 +0000 (+0200)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h
	src/mesa/shader/slang/slang_preprocess.c
	src/mesa/state_tracker/st_cb_bufferobjects.c
---

ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a