summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-06-18 14:36:41 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-06-18 14:36:41 +0200
commit4abd89cc60a162944bc3fbbf549594374731ad29 (patch)
treeb0364cc123653a27a8e30395a596aa9f37219c30 /scilab/modules/intersci
parent2b59141d3cf5466cc12a435eaa7d4f7dd63a16e0 (diff)
parentb6620ec25a68ef3d58dd35d858ba7bf072d7ebf0 (diff)
downloadscilab-4abd89cc60a162944bc3fbbf549594374731ad29.zip
scilab-4abd89cc60a162944bc3fbbf549594374731ad29.tar.gz
Merge commit 'refs/remotes/origin/5.1'
Conflicts: scilab/configure scilab/modules/pvm/Makefile.am scilab/modules/pvm/Makefile.in
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index d1a3e5a..596b32e 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -251,8 +251,8 @@ PCRE_VERSION = @PCRE_VERSION@
251PKG_CONFIG = @PKG_CONFIG@ 251PKG_CONFIG = @PKG_CONFIG@
252POSUB = @POSUB@ 252POSUB = @POSUB@
253POW_LIB = @POW_LIB@ 253POW_LIB = @POW_LIB@
254PVMARCH = @PVMARCH@
255PVMGETARCH = @PVMGETARCH@ 254PVMGETARCH = @PVMGETARCH@
255PVM_ARCH = @PVM_ARCH@
256PVM_ENABLE = @PVM_ENABLE@ 256PVM_ENABLE = @PVM_ENABLE@
257PVM_INCLUDE = @PVM_INCLUDE@ 257PVM_INCLUDE = @PVM_INCLUDE@
258PVM_LIB = @PVM_LIB@ 258PVM_LIB = @PVM_LIB@