From: Jakob Bornecrantz <jakob@vmware.com>
Date: Fri, 3 Jul 2009 16:53:58 +0000 (+0200)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=862488075c5537b0613753b0d14c267527fc6199;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:
	src/mesa/main/dlist.c
	src/mesa/vbo/vbo_save_api.c
---

862488075c5537b0613753b0d14c267527fc6199
diff --cc progs/tests/.gitignore
index 917c4f3e8d2,7c6c245d394..3479ff8b33b
--- a/progs/tests/.gitignore
+++ b/progs/tests/.gitignore
@@@ -57,8 -54,8 +57,9 @@@ mipmap_vie
  multipal
  no_s3tc
  packedpixels
 +persp_hint
  pbo
+ prim
  prog_parameter
  quads
  random