Mercurial > octave-nkf
changeset 14350:1238163688a0 stable
maint: merge release candidate changesets
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 09 Feb 2012 11:27:08 -0500 |
| parents | 06f706e92771 (current diff) e9081ee7e714 (diff) |
| children | cb4f1915db92 |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Feb 08 16:44:13 2012 -0500 +++ b/.hgtags Thu Feb 09 11:27:08 2012 -0500 @@ -59,3 +59,4 @@ 72aebe6196414e38ef802469ff6e238f914f04c9 rc-3-6-0-0 64d9f33313cc8c691974bcd123357e24bccbabdc rc-3-6-0-1 704f7895eef03008dd79848eb9da4bfb40787d73 release-3.6.0 +95c43fc8dbe1a07a46fefb3372df5b2309d874fd rc-3-6-1-0
--- a/configure.ac Wed Feb 08 16:44:13 2012 -0500 +++ b/configure.ac Thu Feb 09 11:27:08 2012 -0500 @@ -27,13 +27,13 @@ EXTERN_CFLAGS="$CFLAGS" EXTERN_CXXFLAGS="$CXXFLAGS" -AC_INIT([GNU Octave], [3.6.0], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [3.6.1-rc0], [http://octave.org/bugs.html], [octave]) dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="48" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-01-15" +OCTAVE_RELEASE_DATE="2012-02-07" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER)
--- a/liboctave/Makefile.am Wed Feb 08 16:44:13 2012 -0500 +++ b/liboctave/Makefile.am Thu Feb 09 11:27:08 2012 -0500 @@ -521,7 +521,7 @@ # Increment these as needed and according to the rules in the libtool # manual: liboctave_current = 1 -liboctave_revision = 0 +liboctave_revision = 1 liboctave_age = 0 liboctave_version_info = $(liboctave_current):$(liboctave_revision):$(liboctave_age)
--- a/src/Makefile.am Wed Feb 08 16:44:13 2012 -0500 +++ b/src/Makefile.am Thu Feb 09 11:27:08 2012 -0500 @@ -516,7 +516,7 @@ # Increment these as needed and according to the rules in the libtool manual: liboctinterp_current = 1 -liboctinterp_revision = 0 +liboctinterp_revision = 1 liboctinterp_age = 0 liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)