From: Brian Paul <brianp@vmware.com>
Date: Fri, 22 Oct 2010 01:05:40 +0000 (-0600)
Subject: Merge branch 'primitive-restart-cleanup'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69a07be3e527dbc2148a4e20c50e60266225f5f2;p=mesa.git

Merge branch 'primitive-restart-cleanup'

Conflicts:
	docs/relnotes-7.10.html

This branch is a re-do of the primitive-restart branch with all
the intermediate/temporary stuff cleaned out.
---

69a07be3e527dbc2148a4e20c50e60266225f5f2
diff --cc docs/relnotes-7.10.html
index 4d342dce006,98b70b877bb..2d0adcc8cd6
--- a/docs/relnotes-7.10.html
+++ b/docs/relnotes-7.10.html
@@@ -35,7 -35,7 +35,8 @@@ tb
  <h2>New features</h2>
  <ul>
  <li>GL_ARB_explicit_attrib_location extension (Intel and software drivers).
 +<li>GL_ARB_texture_rg (Intel, software drivers, gallium drivers).
+ <li>GL_NV_primitive_restart extension (Gallium softpipe, llvmpipe).
  </ul>