changeset 29116:14545c8b1b73

maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Nov 2020 13:49:11 -0500
parents 4d8aaceb629a (current diff) 756cd46286c6 (diff)
children 10a35049bad7
files NEWS configure.ac etc/NEWS.6
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Nov 27 08:04:39 2020 -0800
+++ b/.hgtags	Fri Nov 27 13:49:11 2020 -0500
@@ -121,3 +121,4 @@
 eb46a9f471647626d3a199e40d0c235d54e2b256 release-5-2-0
 844b3b9bab7a137c08cbec7cb0ae3bca2ae0b70d rc-6-0-90
 c67f39732d1441a685a524586ebcf2246641b4f5 rc-6-0-92
+9f39338a23cbbff9bb2681d536451340cb08df12 release-6-1-0
--- a/etc/NEWS.6	Fri Nov 27 08:04:39 2020 -0800
+++ b/etc/NEWS.6	Fri Nov 27 13:49:11 2020 -0500
@@ -1,4 +1,4 @@
-Summary of important user-visible changes for version 6.1.0 (2020-08-26):
+Summary of important user-visible changes for version 6.1.0 (2020-11-26):
 ------------------------------------------------------------------------
 
 ### General improvements
--- a/etc/icons/org.octave.Octave.appdata.xml	Fri Nov 27 08:04:39 2020 -0800
+++ b/etc/icons/org.octave.Octave.appdata.xml	Fri Nov 27 13:49:11 2020 -0500
@@ -169,6 +169,7 @@
   <developer_name>John W. Eaton and others</developer_name>
   <content_rating type="oars-1.0"/>
   <releases>
+    <release date="2020-11-26" version="6.1.0"/>
     <release date="2020-01-31" version="5.2.0"/>
     <release date="2019-02-23" version="5.1.0"/>
     <release date="2018-08-09" version="4.4.1"/>