summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
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/javasci
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/javasci')
-rw-r--r--scilab/modules/javasci/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 90c12c2..3b4b1e9 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -242,6 +242,7 @@ JEUCLID_CORE = @JEUCLID_CORE@
242JGRAPHX = @JGRAPHX@ 242JGRAPHX = @JGRAPHX@
243JHALL = @JHALL@ 243JHALL = @JHALL@
244JHDF5 = @JHDF5@ 244JHDF5 = @JHDF5@
245JLATEXMATH = @JLATEXMATH@
245JOGL = @JOGL@ 246JOGL = @JOGL@
246JROSETTA_API = @JROSETTA_API@ 247JROSETTA_API = @JROSETTA_API@
247JROSETTA_ENGINE = @JROSETTA_ENGINE@ 248JROSETTA_ENGINE = @JROSETTA_ENGINE@