Mercurial > octave-libtiff
changeset 22553:05ab1526377a
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 29 Sep 2016 13:53:43 -0400 |
| parents | b749559245a1 (diff) acb3e59119d9 (current diff) |
| children | 53209d4c9421 |
| files | configure.ac |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Sep 29 13:52:17 2016 -0400 +++ b/configure.ac Thu Sep 29 13:53:43 2016 -0400 @@ -19,14 +19,14 @@ ### <http://www.gnu.org/licenses/>. AC_PREREQ([2.63]) -AC_INIT([GNU Octave], [4.2.0-rc2], [http://octave.org/bugs.html], [octave]) +AC_INIT([GNU Octave], [4.3.0+], [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=2 -OCTAVE_PATCH_VERSION=0-rc2 +OCTAVE_MINOR_VERSION=3 +OCTAVE_PATCH_VERSION=0+ dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION"
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Sep 29 13:52:17 2016 -0400 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Sep 29 13:53:43 2016 -0400 @@ -38,6 +38,7 @@ #include <QDragEnterEvent> #include <QDropEvent> #include <QUrl> +#include <QMimeData> #include <fcntl.h> #include <io.h>