From: Brian Paul <brianp@vmware.com>
Date: Tue, 28 Jul 2009 14:58:25 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2f6d6ce49699d35d6b6a234fe17a27d99f4b267;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h
---

d2f6d6ce49699d35d6b6a234fe17a27d99f4b267
diff --cc docs/relnotes.html
index 35a4c7385f7,7b91a3dc5ec..ddd2e1cdedb
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -13,7 -13,7 +13,8 @@@ The release notes summarize what's new 
  </p>
  
  <UL>
 +<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
+ <LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
  <LI><A HREF="relnotes-7.5.html">7.5 release notes</A>
  <LI><A HREF="relnotes-7.4.4.html">7.4.4 release notes</A>
  <LI><A HREF="relnotes-7.4.3.html">7.4.3 release notes</A>