diff configure.ac @ 20235:3e8c188b20a7

maint: Periodic merge of stable to default.
author John W. Eaton <jwe@octave.org>
date Sat, 30 May 2015 05:39:47 -0400
parents 5d6a2c4caf05 3ccc2d02e64b
children 78293a28f2a5
line wrap: on
line diff
--- a/configure.ac	Wed May 27 16:12:18 2015 -0400
+++ b/configure.ac	Sat May 30 05:39:47 2015 -0400
@@ -25,15 +25,15 @@
 dnl because AC_INIT requires it to be static, not computed from
 dnl shell variables.
 OCTAVE_MAJOR_VERSION=4
-OCTAVE_MINOR_VERSION=0
-OCTAVE_PATCH_VERSION=0-rc4
+OCTAVE_MINOR_VERSION=1
+OCTAVE_PATCH_VERSION=0+
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
 
 OCTAVE_COPYRIGHT="Copyright (C) 2015 John W. Eaton and others."
 
-OCTAVE_RELEASE_DATE="2015-03-20"
+OCTAVE_RELEASE_DATE="2015-05-26"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly