Mercurial > octave
changeset 29381:be539c9d29d1
maint: merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 21 Feb 2021 02:49:00 -0500 |
parents | 107091f22e65 (current diff) 1008d5e29a66 (diff) |
children | 95e2e0cab49b |
files | configure.ac |
diffstat | 2 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Feb 19 21:25:07 2021 -0800 +++ b/.hgtags Sun Feb 21 02:49:00 2021 -0500 @@ -122,3 +122,5 @@ 844b3b9bab7a137c08cbec7cb0ae3bca2ae0b70d rc-6-0-90 c67f39732d1441a685a524586ebcf2246641b4f5 rc-6-0-92 9f39338a23cbbff9bb2681d536451340cb08df12 release-6-1-0 +5cfdf97c5350d41018311dace50e3486176eefa6 release-6-2-0 +55008004bb9a6e95256d57e882e3716ac45b15ee rc-6-1-90
--- a/etc/icons/org.octave.Octave.appdata.xml Fri Feb 19 21:25:07 2021 -0800 +++ b/etc/icons/org.octave.Octave.appdata.xml Sun Feb 21 02:49:00 2021 -0500 @@ -169,6 +169,7 @@ <developer_name>John W. Eaton and others</developer_name> <content_rating type="oars-1.0"/> <releases> + <release date="2021-02-19" version="6.2.0"/> <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"/>