diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2020-09-28 16:23:44 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-10-12 09:56:54 -0700 |
| commit | 63f61b084a5310c58eaf3ea1ef305382fbe70198 (patch) | |
| tree | 0280abb62d5cec4f8516c3131cb0c766d0b80697 /docs | |
| parent | b32a8f83dce3b8789f2e8790ab41b8a63c9bedc6 (diff) | |
docs: update calendar and link releases notes for 20.2
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6904>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/release-calendar.rst | 2 | ||||
| -rw-r--r-- | docs/relnotes.rst | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/release-calendar.rst b/docs/release-calendar.rst index 48f60d20361..6ee2c6a94b4 100644 --- a/docs/release-calendar.rst +++ b/docs/release-calendar.rst @@ -32,5 +32,3 @@ Calendar +========+===============+============+=================+=========================================+ | 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 | -+--------+---------------+------------+-----------------+-----------------------------------------+ diff --git a/docs/relnotes.rst b/docs/relnotes.rst index 422f6d9996c..91af84cc359 100644 --- a/docs/relnotes.rst +++ b/docs/relnotes.rst @@ -4,6 +4,7 @@ Release Notes 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 @@ file <versions>` and the following release notes. :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 |