changeset 20143:cbce57ca9747 stable

maint: Merge away extra head.
author John W. Eaton <jwe@octave.org>
date Wed, 29 Apr 2015 00:54:37 -0400
parents a2e84b98eb69 (diff) 64a2d4c87ecb (current diff)
children f8d443fe0de3
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 28 14:03:03 2015 -0700
+++ b/.hgtags	Wed Apr 29 00:54:37 2015 -0400
@@ -93,3 +93,4 @@
 52d2bbf49c922440621b42b1c1679f0e55462485 rc-4-0-0-1
 eba80000fa0dad32ba0f1cd767dd826d1ce1aba6 rc-4-0-0-2
 065f933ef08318e40b81f7fe75236e6175088117 rc-4-0-0-3
+42bb3a776c9fcc008669f382d2409297c4a901b3 rc-4-0-0-4
--- a/configure.ac	Tue Apr 28 14:03:03 2015 -0700
+++ b/configure.ac	Wed Apr 29 00:54:37 2015 -0400
@@ -19,14 +19,14 @@
 ### <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.63])
-AC_INIT([GNU Octave], [4.0.0-rc3], [http://octave.org/bugs.html], [octave])
+AC_INIT([GNU Octave], [4.0.0-rc4], [http://octave.org/bugs.html], [octave])
 
 dnl Note that the version number is duplicated here and in AC_INIT
 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-rc3
+OCTAVE_PATCH_VERSION=0-rc4
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"