summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-05-13 10:50:16 +0200
committerClément DAVID <clement.david@scilab.org>2011-05-13 10:50:16 +0200
commit243216a8d0fd685d4af1fda457ede653b9a87a5b (patch)
tree8eb2cef50bbe25ab53329475a56d6e485c7174c2 /scilab/modules/intersci
parent5e115d215049c518d4e687e5f74683ed6e59879f (diff)
parenta5cbed5a0f7b8ea6ceed174cc6707a3ce4d655db (diff)
downloadscilab-243216a8d0fd685d4af1fda457ede653b9a87a5b.zip
scilab-243216a8d0fd685d4af1fda457ede653b9a87a5b.tar.gz
Merge commit '5.3.2' into simulinkimportsimulinkimport
Change-Id: I61d0f569b84671ab0be452d8ae7ca9a9fd5595ff
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in8
-rw-r--r--scilab/modules/intersci/locales/intersci.pot2
-rw-r--r--scilab/modules/intersci/version.xml2
3 files changed, 6 insertions, 6 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 4f54491..f2508f8 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -65,10 +65,10 @@ DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
65@NEED_JAVA_TRUE@am__append_1 = java 65@NEED_JAVA_TRUE@am__append_1 = java
66subdir = modules/intersci 66subdir = modules/intersci
67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 67ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 \ 71 $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \ 72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
73 $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \ 73 $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
74 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \ 74 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
diff --git a/scilab/modules/intersci/locales/intersci.pot b/scilab/modules/intersci/locales/intersci.pot
index d0ae21f..e6340f7 100644
--- a/scilab/modules/intersci/locales/intersci.pot
+++ b/scilab/modules/intersci/locales/intersci.pot
@@ -14,5 +14,5 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2011-03-09 14:19+0100\n" 17"Revision-Date: 2011-05-10 10:57+0100\n"
18 18
diff --git a/scilab/modules/intersci/version.xml b/scilab/modules/intersci/version.xml
index 61d41a1..9c5d3f9 100644
--- a/scilab/modules/intersci/version.xml
+++ b/scilab/modules/intersci/version.xml
@@ -8,5 +8,5 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="intersci"> 10<MODULE_VERSION name="intersci">
11<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="2" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>