Mercurial > octave-nkf
changeset 16065:6a44bb3c9593 stable
maint: merge away extra head on stable
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 16 Feb 2013 18:51:29 -0500 |
| parents | c5b4b9507a55 (current diff) f47b8b3e2442 (diff) |
| children | 0df6c1c73e21 16345c7b4ed1 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Feb 13 12:45:31 2013 -0800 +++ b/.hgtags Sat Feb 16 18:51:29 2013 -0500 @@ -66,3 +66,4 @@ a95432e7309ca6fc776c02939264bb6d443f3525 release-3-6-3 2e8eb9ac43a5f8cfaf0423814a312ed47cb80485 rc-3-6-4-0 858cbf6fc2ec1c232f5cf1d75dc344439b39a89c rc-3-6-4-1 +cc5a7d1233f3acea85648baeb754fc0e8f225225 rc-3-6-4-2
--- a/configure.ac Wed Feb 13 12:45:31 2013 -0800 +++ b/configure.ac Sat Feb 16 18:51:29 2013 -0500 @@ -27,14 +27,14 @@ EXTERN_CFLAGS="$CFLAGS" EXTERN_CXXFLAGS="$CXXFLAGS" -AC_INIT([GNU Octave], [3.6.4-rc1], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [3.6.4-rc2], [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="2013-01-03" -OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." +OCTAVE_RELEASE_DATE="2013-02-11" +OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER) AC_SUBST(OCTAVE_API_VERSION)
--- a/scripts/optimization/sqp.m Wed Feb 13 12:45:31 2013 -0800 +++ b/scripts/optimization/sqp.m Sat Feb 16 18:51:29 2013 -0500 @@ -760,7 +760,7 @@ %! %! obj_opt = 0.0539498477702739; %! -%! assert (all (abs (x-x_opt) < 5*sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps)); +%! assert (all (abs (x-x_opt) < 8*sqrt (eps)) && abs (obj-obj_opt) < sqrt (eps)); %% Test input validation %!error sqp ()