changeset 3462:369b21249f13

merge away extra head
author John W. Eaton <jwe@octave.org>
date Tue, 28 Jan 2014 03:45:26 -0500
parents bc0e6c5189cd (current diff) fc11211443d5 (diff)
children 7901815035d6
files dist-files.mk
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Mon Jan 27 20:50:22 2014 -0500
+++ b/configure.ac	Tue Jan 28 03:45:26 2014 -0500
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([MXE-Octave], [0.0.17], [http://octave.org/bugs.html], [mxe-octave])
+AC_INIT([MXE-Octave], [0.0.18], [http://octave.org/bugs.html], [mxe-octave])
 
 AC_CONFIG_SRCDIR([src/octave.mk])
 AC_CONFIG_AUX_DIR([tools])
--- a/dist-files.mk	Mon Jan 27 20:50:22 2014 -0500
+++ b/dist-files.mk	Tue Jan 28 03:45:26 2014 -0500
@@ -30,6 +30,8 @@
   build-msvctools.mk \
   build-pkg-config-1-fixes.patch \
   build-pkg-config.mk \
+  build-python.mk \
+  build-scons.mk \
   build-texinfo.mk \
   build-xz.mk \
   bzip2.mk \