From: Brian Paul <brianp@vmware.com>
Date: Thu, 10 Sep 2009 21:40:26 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d;p=mesa.git

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
---

4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d
diff --cc docs/relnotes.html
index ddd2e1cdedb,9026a282860..560a660af49
--- 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.2.html">7.5.2 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>