From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 26 Sep 2008 13:09:04 +0000 (+0100)
Subject: Merge commit 'origin/master' into HEAD
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb8db63a89c4ac7fbbbc0912e1dde0871ae9c35c;p=mesa.git

Merge commit 'origin/master' into HEAD

Conflicts:

	src/mesa/vbo/vbo.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_exec_draw.c
---

fb8db63a89c4ac7fbbbc0912e1dde0871ae9c35c