summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab.org>2009-10-12 13:00:15 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2009-10-12 13:00:15 +0200
commitbb7c1b41531082d585ef5e84dcd307de13402114 (patch)
treeb996ede77e771874086e71411d1525a6bac74341 /scilab/modules/intersci
parente2c628f88045f218e7be02fae414caac7e88f1c6 (diff)
parent9d504785f07c01fe51821aac2b5515f94f7e593b (diff)
downloadscilab-bb7c1b41531082d585ef5e84dcd307de13402114.zip
scilab-bb7c1b41531082d585ef5e84dcd307de13402114.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 0ea19ea..525f4f7 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -226,6 +226,7 @@ JEUCLID_CORE = @JEUCLID_CORE@
226JGRAPHX = @JGRAPHX@ 226JGRAPHX = @JGRAPHX@
227JHALL = @JHALL@ 227JHALL = @JHALL@
228JHDF5 = @JHDF5@ 228JHDF5 = @JHDF5@
229JLATEXMATH = @JLATEXMATH@
229JOGL = @JOGL@ 230JOGL = @JOGL@
230JROSETTA_API = @JROSETTA_API@ 231JROSETTA_API = @JROSETTA_API@
231JROSETTA_ENGINE = @JROSETTA_ENGINE@ 232JROSETTA_ENGINE = @JROSETTA_ENGINE@