# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1613054613 18000
# Node ID 97873d6851fbf9ddf80a81bb64bf51ffe067745d
# Parent  cd5aefb0762dec1d284452e10150c65f8c03a116# Parent  c724e30df2ba1af6ae7c6eedf6f80f45c842192e
merge 6.1.90 release candidate changes with default

diff -r cd5aefb0762d -r 97873d6851fb .hgtags
--- a/.hgtags	Wed Feb 10 14:25:01 2021 -0500
+++ b/.hgtags	Thu Feb 11 09:43:33 2021 -0500
@@ -11,3 +11,4 @@
 039563087c70904213cd835dc3e9a8c5025ec6eb octave-rc-6.0.90
 60c8f985d8f59effea0fddb7ccf4b7a7c63c71fd octave-rc-6-0-92
 a1004ea5643dc65ef0f156fc1f5fce561feb1e57 octave-release-6.1.0
+f062783e4ace3bb551cf51d7592920255770f583 octave-rc-6.1.90
diff -r cd5aefb0762d -r 97873d6851fb src/release-octave.mk
--- a/src/release-octave.mk	Wed Feb 10 14:25:01 2021 -0500
+++ b/src/release-octave.mk	Thu Feb 11 09:43:33 2021 -0500
@@ -34,8 +34,8 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.1.0
-$(PKG)_CHECKSUM := 9b14c1471cc27fb0f6e230a0e882f883f505ea4b
+$(PKG)_VERSION  := 6.1.90
+$(PKG)_CHECKSUM := f42ec07cbe4c1c1d9d7f60929eb910e5c54a0bd6
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
diff -r cd5aefb0762d -r 97873d6851fb src/stable-octave.mk
--- a/src/stable-octave.mk	Wed Feb 10 14:25:01 2021 -0500
+++ b/src/stable-octave.mk	Thu Feb 11 09:43:33 2021 -0500
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.1.1
+$(PKG)_VERSION  := 6.1.91
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz