# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1581961433 18000
# Node ID c2a95ab0e94b02979cbb788d96d716d5b912ed7c
# Parent  ff46a5d19dc089d4179abd99946e596e02911405# Parent  564fe206b431b176e1d9f8eef83f45723a78b0d8
maint: Merge stable to default, begin active development of Octave 7

* configure.ac (AC_INIT): Bump version to 7.0.0 for active development
phase leading to Octave 7.1 release.
(OCTAVE_MAJOR_VERSION): Now 7.
(OCTAVE_RELEASE_DATE): Update.

diff -r ff46a5d19dc0 -r c2a95ab0e94b configure.ac
--- a/configure.ac	Mon Feb 17 12:38:34 2020 -0500
+++ b/configure.ac	Mon Feb 17 12:43:53 2020 -0500
@@ -27,7 +27,7 @@
 
 ### Initialize Autoconf
 AC_PREREQ([2.65])
-AC_INIT([GNU Octave], [6.0.0], [https://octave.org/bugs.html], [octave],
+AC_INIT([GNU Octave], [7.0.0], [https://octave.org/bugs.html], [octave],
         [https://www.gnu.org/software/octave/])
 
 ### Declare version numbers
@@ -39,7 +39,7 @@
 ## explains how to update these numbers for release and development
 ## versions.
 
-OCTAVE_MAJOR_VERSION=6
+OCTAVE_MAJOR_VERSION=7
 OCTAVE_MINOR_VERSION=0
 OCTAVE_PATCH_VERSION=0
 
@@ -48,7 +48,7 @@
 
 OCTAVE_COPYRIGHT="Copyright (C) 2020 The Octave Project Developers."
 
-OCTAVE_RELEASE_DATE="2019-02-23"
+OCTAVE_RELEASE_DATE="2020-02-17"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly