Mercurial > octave
changeset 24944:13edbb760108
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 21 Mar 2018 10:28:07 -0700 |
| parents | cc55705f1f84 (diff) 23b5c0678051 (current diff) |
| children | 7116fc02ef3a |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 21 10:27:32 2018 -0700 +++ b/.hgtags Wed Mar 21 10:28:07 2018 -0700 @@ -108,3 +108,4 @@ 69ac19073ae630b276ff7788b78f72782f281657 rc-4-2-0-4 708a4fcb73820484a3af94dd4d18453c4d9b29c9 release-4-2-0 1327ea4f5a931a6cc2a6d4790af58cf16de4702b release-4-2-1 +94f8e2b5a88b79974084c0ae541cacbcc62d64f6 release-4-2-2
--- a/configure.ac Wed Mar 21 10:27:32 2018 -0700 +++ b/configure.ac Wed Mar 21 10:28:07 2018 -0700 @@ -20,7 +20,7 @@ ### Initialize Autoconf AC_PREREQ([2.65]) -AC_INIT([GNU Octave], [4.3.0+], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [4.5.0+], [http://octave.org/bugs.html], [octave]) ### Declare version numbers @@ -28,7 +28,7 @@ dnl AC_INIT requires it to be static, not computed from shell variables. OCTAVE_MAJOR_VERSION=4 -OCTAVE_MINOR_VERSION=3 +OCTAVE_MINOR_VERSION=5 OCTAVE_PATCH_VERSION=0+ dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument. @@ -51,7 +51,7 @@ dnl FIXME: Since we also set libtool versions for liboctave and libinterp, dnl perhaps we should be computing the "api version" from those versions numbers dnl in some way instead of setting it independently here. -OCTAVE_API_VERSION="api-v51+" +OCTAVE_API_VERSION="api-v52+" AC_SUBST(OCTAVE_MAJOR_VERSION) AC_SUBST(OCTAVE_MINOR_VERSION)