summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab.org>2009-10-06 12:08:44 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2009-10-06 12:08:44 +0200
commit1cc00f67b9b360cfb9c5a9a51afd730d0cb70722 (patch)
treee994cdceb5be28b9fdb8ee23ba6d6e5a5b9730c8 /scilab/modules/intersci
parent02ec8bc9f9a714208d6a591145805d3089ab1ab7 (diff)
parentafe22f00b5deb2268ec6a3ed61cc30911cbb5eef (diff)
downloadscilab-1cc00f67b9b360cfb9c5a9a51afd730d0cb70722.zip
scilab-1cc00f67b9b360cfb9c5a9a51afd730d0cb70722.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/Version.incl scilab/configure scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 539dd2e..3148039 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -360,7 +360,6 @@ libdir = @libdir@
360libexecdir = @libexecdir@ 360libexecdir = @libexecdir@
361localedir = @localedir@ 361localedir = @localedir@
362localstatedir = @localstatedir@ 362localstatedir = @localstatedir@
363lt_ECHO = @lt_ECHO@
364mandir = @mandir@ 363mandir = @mandir@
365mkdir_p = @mkdir_p@ 364mkdir_p = @mkdir_p@
366oldincludedir = @oldincludedir@ 365oldincludedir = @oldincludedir@