Mercurial > octave-nkf
changeset 18176:c26f44818eed gui-release
maint: Periodic merge of stable to gui-release.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 27 Dec 2013 17:01:10 -0500 |
| parents | 002c06b3fc51 (current diff) 7e4aadff1590 (diff) |
| children | 256e280850f1 |
| files | configure.ac libgui/src/main-window.cc |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 24 01:41:22 2013 -0500 +++ b/.hgtags Fri Dec 27 17:01:10 2013 -0500 @@ -82,3 +82,4 @@ cc13924a4266fb0359f59fabdce11071e6051d48 ss-3-7-7 d734216aa2b1022c190e6b07d7ccdd59fe15678f rc-3-8-0-1 f1fa148766d623f7f24cf541ea8b88d8c1b63d33 rc-3-8-0-2 +b72bcf5f78cc2231e9bf2735d3b8d92779fc4dff release-3-8-0
--- a/configure.ac Tue Dec 24 01:41:22 2013 -0500 +++ b/configure.ac Fri Dec 27 17:01:10 2013 -0500 @@ -25,7 +25,7 @@ OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="49" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2013-12-21" +OCTAVE_RELEASE_DATE="2013-12-27" OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER)
--- a/libgui/src/main-window.cc Tue Dec 24 01:41:22 2013 -0500 +++ b/libgui/src/main-window.cc Fri Dec 27 17:01:10 2013 -0500 @@ -1909,7 +1909,7 @@ "have decided to wait until the 4.0.x release series before " "making the GUI the default interface.</p>" "<p>Given the length of time and the number of bug fixes and " - "improvements since the last major release Octave, we also " + "improvements since the last major release, we also " "decided against delaying the release of all these new " "improvements any longer just to perfect the GUI. So please " "enjoy the 3.8 release of Octave and the preview of the new GUI. "