summaryrefslogtreecommitdiff
path: root/docs/relnotes.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/relnotes.html')
-rw-r--r--docs/relnotes.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/relnotes.html b/docs/relnotes.html
index b301ee046a..f1f95c5d3c 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -13,6 +13,9 @@ 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>
<LI><A HREF="relnotes-7.6.html">7.6 release notes</A>