Merge branch 'mesa_7_7_branch'

[mesa.git] / docs / relnotes.html

diff --git a/docs/relnotes.html b/docs/relnotes.html
index b06548ae61a7f40821929198df0287f62f9c6273..f1f95c5d3cad184ddc8ce3c5cbd7cf71d64c49e5 100644 (file)
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,8 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<<<<<<< HEAD:docs/relnotes.html
+<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>
 <LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A>