docs: Mention that GLSL 1.30 is started.

[mesa.git] / docs / relnotes.html

diff --git a/docs/relnotes.html b/docs/relnotes.html
index f1f95c5d3cad184ddc8ce3c5cbd7cf71d64c49e5..c1a7ab78dfd1f521e7e327ae4be4951646df016d 100644 (file)
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,7 +13,16 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
-<<<<<<< HEAD:docs/relnotes.html
+<LI><A HREF="relnotes-7.11.html">7.11 release notes</A>
+<LI><A HREF="relnotes-7.10.2.html">7.10.2 release notes</A>
+<LI><A HREF="relnotes-7.10.1.html">7.10.1 release notes</A>
+<LI><A HREF="relnotes-7.10.html">7.10 release notes</A>
+<LI><A HREF="relnotes-7.9.2.html">7.9.2 release notes</A>
+<LI><A HREF="relnotes-7.9.1.html">7.9.1 release notes</A>
+<LI><A HREF="relnotes-7.9.html">7.9 release notes</A>
+<LI><A HREF="relnotes-7.8.3.html">7.8.3 release notes</A>
+<LI><A HREF="relnotes-7.8.2.html">7.8.2 release notes</A>
+<LI><A HREF="relnotes-7.8.1.html">7.8.1 release notes</A>
 <LI><A HREF="relnotes-7.8.html">7.8 release notes</A>
 <LI><A HREF="relnotes-7.7.1.html">7.7.1 release notes</A>
 <LI><A HREF="relnotes-7.7.html">7.7 release notes</A>