summaryrefslogtreecommitdiffstats
path: root/scilab/modules/special_functions
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/special_functions
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/special_functions')
-rw-r--r--scilab/modules/special_functions/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 68f0f3e..bc9d97c 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -260,6 +260,7 @@ LD = @LD@
260LDFLAGS = @LDFLAGS@ 260LDFLAGS = @LDFLAGS@
261LIBICONV = @LIBICONV@ 261LIBICONV = @LIBICONV@
262LIBINTL = @LIBINTL@ 262LIBINTL = @LIBINTL@
263LIBM = @LIBM@
263LIBOBJS = @LIBOBJS@ 264LIBOBJS = @LIBOBJS@
264LIBS = @LIBS@ 265LIBS = @LIBS@
265LIBTOOL = @LIBTOOL@ 266LIBTOOL = @LIBTOOL@