summaryrefslogtreecommitdiffstats
path: root/scilab/modules/texmacs
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/texmacs
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/texmacs')
-rw-r--r--scilab/modules/texmacs/Makefile.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index f837932..2821996 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -199,6 +199,7 @@ LD = @LD@
199LDFLAGS = @LDFLAGS@ 199LDFLAGS = @LDFLAGS@
200LIBICONV = @LIBICONV@ 200LIBICONV = @LIBICONV@
201LIBINTL = @LIBINTL@ 201LIBINTL = @LIBINTL@
202LIBM = @LIBM@
202LIBOBJS = @LIBOBJS@ 203LIBOBJS = @LIBOBJS@
203LIBS = @LIBS@ 204LIBS = @LIBS@
204LIBTOOL = @LIBTOOL@ 205LIBTOOL = @LIBTOOL@