summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-02-15 11:30:21 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-02-15 11:30:21 +0100
commit851ec39987fc03dfedc4b1a2c1df3e7e68fa0079 (patch)
tree8968ec339621f0dd25345c883fa9400f13f184b2 /scilab/modules/scicos_blocks
parent34a00e821bad47bce84ff97063a1916f67dc7625 (diff)
parentc2713aecd0de9cdb32273fb80245047ca35e5d8f (diff)
downloadscilab-851ec39987fc03dfedc4b1a2c1df3e7e68fa0079.zip
scilab-851ec39987fc03dfedc4b1a2c1df3e7e68fa0079.tar.gz
merge with master
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index d096c36..d6a4e1a 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -731,6 +731,7 @@ JGRAPHX = @JGRAPHX@
731JHALL = @JHALL@ 731JHALL = @JHALL@
732JHDF5 = @JHDF5@ 732JHDF5 = @JHDF5@
733JLATEXMATH = @JLATEXMATH@ 733JLATEXMATH = @JLATEXMATH@
734JLATEXMATH_FOP = @JLATEXMATH_FOP@
734JOGL = @JOGL@ 735JOGL = @JOGL@
735JROSETTA_API = @JROSETTA_API@ 736JROSETTA_API = @JROSETTA_API@
736JROSETTA_ENGINE = @JROSETTA_ENGINE@ 737JROSETTA_ENGINE = @JROSETTA_ENGINE@