summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 10:44:21 +0200
commitd5ec130218f86ced2e72096ab24feeafa14373dd (patch)
treeff59bffb70de4544f946ea33965648d39893cfcd /scilab/modules/javasci
parent735d3e217f1a1b3eb62bc5dbdefb7d9693226954 (diff)
parent033309380f01622698f2ea0cf744cf6cc72250db (diff)
downloadscilab-d5ec130218f86ced2e72096ab24feeafa14373dd.zip
scilab-d5ec130218f86ced2e72096ab24feeafa14373dd.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/functions/tests/unit_tests/getf.tst Change-Id: Ic209624ec52e0615fce1f02c08a387aea90b8ded
Diffstat (limited to 'scilab/modules/javasci')
-rw-r--r--scilab/modules/javasci/build.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/javasci/build.xml b/scilab/modules/javasci/build.xml
index 2e3d130..babcb5c 100644
--- a/scilab/modules/javasci/build.xml
+++ b/scilab/modules/javasci/build.xml
@@ -54,6 +54,7 @@
54 debug="off" 54 debug="off"
55 verbose="off" 55 verbose="off"
56 listfiles="on" 56 listfiles="on"
57 includeAntRuntime="no"
57 source="5" 58 source="5"
58 /> 59 />
59 60