# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1635868371 14400
# Node ID 14f443a73558dccdaebf93d9758e1a35474e63c9
# Parent  313da8fd4657c9ade3b2efb8937266b2ec2d45cb# Parent  869dea2b5c912c92d70c08899ce1443d1298876d
maint: merge stable to default.

diff -r 313da8fd4657 -r 14f443a73558 .hgtags
--- a/.hgtags	Mon Nov 01 18:22:20 2021 +0100
+++ b/.hgtags	Tue Nov 02 11:52:51 2021 -0400
@@ -127,3 +127,4 @@
 9d70a797d54a194b185f89829b0d9cefb93e58ff rc-6-2-90
 754013c3658760136fe473911ba96165a07cb1f5 release-6-3-0
 3dc9decc98f97d0b05fff9dbb66b2400d6139830 rc-6-3-90
+8d7671609955afabf79ceff678cc41eea61583f2 release-6-4-0
diff -r 313da8fd4657 -r 14f443a73558 CITATION
--- a/CITATION	Mon Nov 01 18:22:20 2021 +0100
+++ b/CITATION	Tue Nov 02 11:52:51 2021 -0400
@@ -3,15 +3,15 @@
   John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2020).
   GNU Octave version 6.1.0 manual: a high-level interactive language for
   numerical computations.
-  URL https://www.gnu.org/software/octave/doc/v6.1.0/
+  URL https://www.gnu.org/software/octave/doc/v6.3.0/
 
 A BibTeX entry for LaTeX users is:
 
   @manual{,
-    title     = {{GNU Octave} version 6.1.0 manual: a high-level interactive language for numerical computations},
+    title     = {{GNU Octave} version 6.3.0 manual: a high-level interactive language for numerical computations},
     author    = {John W. Eaton and David Bateman and S{\o}ren Hauberg and Rik Wehbring},
-    year      = {2020},
-    url       = {https://www.gnu.org/software/octave/doc/v6.1.0/},
+    year      = {2021},
+    url       = {https://www.gnu.org/software/octave/doc/v6.3.0/},
   }
 
 We have invested a lot of time and effort in creating GNU Octave, please
diff -r 313da8fd4657 -r 14f443a73558 NEWS
diff -r 313da8fd4657 -r 14f443a73558 configure.ac
diff -r 313da8fd4657 -r 14f443a73558 etc/NEWS.6
--- a/etc/NEWS.6	Mon Nov 01 18:22:20 2021 +0100
+++ b/etc/NEWS.6	Tue Nov 02 11:52:51 2021 -0400
@@ -1,4 +1,4 @@
-Summary of bugs fixed for version 6.4.0 (tbd)
+Summary of bugs fixed for version 6.4.0 (2021-10-30)
 ----------------------------------------------------
 
 For (bug #XXXXX) see https://savannah.gnu.org/bugs/?XXXXX
diff -r 313da8fd4657 -r 14f443a73558 etc/icons/org.octave.Octave.appdata.xml
--- a/etc/icons/org.octave.Octave.appdata.xml	Mon Nov 01 18:22:20 2021 +0100
+++ b/etc/icons/org.octave.Octave.appdata.xml	Tue Nov 02 11:52:51 2021 -0400
@@ -190,6 +190,7 @@
   <developer_name>John W. Eaton and others</developer_name>
   <content_rating type="oars-1.0"/>
   <releases>
+    <release date="2021-10-30" version="6.4.0"/>
     <release date="2021-07-11" version="6.3.0"/>
     <release date="2021-02-19" version="6.2.0"/>
     <release date="2020-11-26" version="6.1.0"/>