commit 63f61b084a5310c58eaf3ea1ef305382fbe70198
author Dylan Baker <dylan.c.baker@intel.com> Mon Sep 28 16:23:44 2020 -0700
committer Dylan Baker <dylan.c.baker@intel.com> Mon Oct 12 09:56:54 2020 -0700
tree 0280abb62d5cec4f8516c3131cb0c766d0b80697
parent b32a8f83dce3b8789f2e8790ab41b8a63c9bedc6

docs: update calendar and link releases notes for 20.2

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6904>

docs/release-calendar.rst

diff --git a/docs/release-calendar.rst b/docs/release-calendar.rst
index 48f60d2..6ee2c6a 100644
--- a/docs/release-calendar.rst
+++ b/docs/release-calendar.rst
@@ -32,5 +32,3 @@
 +========+===============+============+=================+=========================================+
 | 20.1   | 2020-10-14    | 20.1.10    | Eric Engestrom  | Last planned release of the 20.1 series |
 +--------+---------------+------------+-----------------+-----------------------------------------+
-| 20.2   | 2020-09-16    | 20.2.0-rc5 | Dylan Baker     | or 20.2.0 final                         |
-+--------+---------------+------------+-----------------+-----------------------------------------+

docs/relnotes.rst

diff --git a/docs/relnotes.rst b/docs/relnotes.rst
index 422f6d9..91af84c 100644
--- a/docs/relnotes.rst
+++ b/docs/relnotes.rst
@@ -4,6 +4,7 @@
 The release notes summarize what's new or changed in each Mesa release.
 
 -  :doc:`20.1.9 release notes <relnotes/20.1.9>`
+-  :doc:`20.2 release notes <relnotes/20.2>`
 -  :doc:`20.1.8 release notes <relnotes/20.1.8>`
 -  :doc:`20.1.7 release notes <relnotes/20.1.7>`
 -  :doc:`20.1.6 release notes <relnotes/20.1.6>`
@@ -315,7 +316,11 @@
    :maxdepth: 1
    :hidden:
 
+<<<<<<< HEAD
    relnotes/20.1.9
+=======
+   relnotes/20.2
+>>>>>>> ad127a5b333... docs: update calendar and link releases notes for 20.2
    relnotes/20.1.8
    relnotes/20.1.7
    relnotes/20.1.6