summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-01-22 10:25:31 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-01-22 10:25:31 +0100
commit15711cf58d78c0432ff22551252cc6c15a20cc6a (patch)
tree5bc9007d36f0406b4b4ad7b2ba5912d2c5252234 /scilab/modules/scicos_blocks
parent739313cd70cad2e3e85cc44a4149638854a64f21 (diff)
parentbab7806d1e9c5a72faa9a48514e26e90d897ed50 (diff)
downloadscilab-15711cf58d78c0432ff22551252cc6c15a20cc6a.zip
scilab-15711cf58d78c0432ff22551252cc6c15a20cc6a.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci b/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
index 6e0a943..549403e 100644
--- a/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
+++ b/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
@@ -195,7 +195,7 @@ function [ok,%ipar,%rpar,%nz]=compile_expr(%foo)
195 if %jjk<> [] then 195 if %jjk<> [] then
196 %ipar=[%ipar;2;%jjk] 196 %ipar=[%ipar;2;%jjk]
197 else 197 else
198 message('Unknow varaiable '+%lst(%ijk)(2)) 198 message('Unknown variable '+%lst(%ijk)(2))
199 ok=%f 199 ok=%f
200 end 200 end
201 //%ipar=[%ipar;2;evstr(strsubst(%lst(%ijk)(2),'u',''))] 201 //%ipar=[%ipar;2;evstr(strsubst(%lst(%ijk)(2),'u',''))]