summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-02-04 18:06:18 +0100
committerClément DAVID <clement.david@scilab.org>2010-02-04 18:06:18 +0100
commit2b44db7fc1b378ba517b58af9f43baa516fbd30e (patch)
tree78205729c50d07dc790cc2aaa8b714dcada364f2 /scilab/modules/javasci
parent12c46edbc61501d031e9662b5556ecfa8ff8955d (diff)
parent9632b35da333e069b672cbd677da3ef97f3fc69c (diff)
downloadscilab-2b44db7fc1b378ba517b58af9f43baa516fbd30e.zip
scilab-2b44db7fc1b378ba517b58af9f43baa516fbd30e.tar.gz
Merge branch '5.2'
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ViewPaletteBrowserAction.java
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 1e568b3..b6359f8 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -254,6 +254,7 @@ LD = @LD@
254LDFLAGS = @LDFLAGS@ 254LDFLAGS = @LDFLAGS@
255LIBICONV = @LIBICONV@ 255LIBICONV = @LIBICONV@
256LIBINTL = @LIBINTL@ 256LIBINTL = @LIBINTL@
257LIBM = @LIBM@
257LIBOBJS = @LIBOBJS@ 258LIBOBJS = @LIBOBJS@
258LIBS = @LIBS@ 259LIBS = @LIBS@
259LIBTOOL = @LIBTOOL@ 260LIBTOOL = @LIBTOOL@