summaryrefslogtreecommitdiffstats
path: root/scilab/modules/compatibility_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/compatibility_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/compatibility_functions')
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 916059b..11ac5cf 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -202,6 +202,7 @@ LD = @LD@
202LDFLAGS = @LDFLAGS@ 202LDFLAGS = @LDFLAGS@
203LIBICONV = @LIBICONV@ 203LIBICONV = @LIBICONV@
204LIBINTL = @LIBINTL@ 204LIBINTL = @LIBINTL@
205LIBM = @LIBM@
205LIBOBJS = @LIBOBJS@ 206LIBOBJS = @LIBOBJS@
206LIBS = @LIBS@ 207LIBS = @LIBS@
207LIBTOOL = @LIBTOOL@ 208LIBTOOL = @LIBTOOL@