From: Brian Paul <brianp@vmware.com>
Date: Mon, 18 May 2009 16:36:50 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h
---

edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4
diff --cc docs/relnotes.html
index 936f565236d,45746268af9..ad5b74bad3c
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@@ -20,8 -20,8 +20,9 @@@ 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.html">7.5 release notes</A>
+ <LI><A HREF="relnotes-7.4.2.html">7.4.2 release notes</A>
  <LI><A HREF="relnotes-7.4.1.html">7.4.1 release notes</A>
  <LI><A HREF="relnotes-7.4.html">7.4 release notes</A>
  <LI><A HREF="relnotes-7.3.html">7.3 release notes</A>