summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 14:02:58 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-14 14:02:58 +0200
commitcc66fb4f35011dd936b0adac35d60653369fe293 (patch)
tree32507decc025f7897d319a35fe9882d0d77cd47f /scilab/modules/scicos_blocks
parentd5ec130218f86ced2e72096ab24feeafa14373dd (diff)
parent6842ae560de190ecdcc47ac384224f15e70a237d (diff)
downloadscilab-cc66fb4f35011dd936b0adac35d60653369fe293.zip
scilab-cc66fb4f35011dd936b0adac35d60653369fe293.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/action_binding/version.xml scilab/modules/arnoldi/version.xml scilab/modules/boolean/version.xml scilab/modules/cacsd/version.xml scilab/modules/call_scilab/version.xml scilab/modules/compatibility_functions/version.xml scilab/modules/completion/version.xml scilab/modules/console/version.xml scilab/modules/core/version.xml scilab/modules/data_structures/version.xml scilab/modules/demo_tools/version.xml scilab/modules/development_tools/version.xml scilab/modules/differential_equations/version.xml scilab/modules/double/version.xml scilab/modules/dynamic_link/version.xml scilab/modules/elementary_functions/version.xml scilab/modules/fftw/version.xml scilab/modules/fileio/version.xml scilab/modules/functions/version.xml scilab/modules/genetic_algorithms/version.xml scilab/modules/graphic_export/version.xml scilab/modules/graphics/version.xml scilab/modules/gui/version.xml scilab/modules/helptools/version.xml scilab/modules/history_manager/version.xml scilab/modules/integer/version.xml scilab/modules/interpolation/version.xml scilab/modules/intersci/version.xml scilab/modules/io/version.xml scilab/modules/javasci/version.xml scilab/modules/jvm/version.xml scilab/modules/linear_algebra/version.xml scilab/modules/localization/version.xml scilab/modules/m2sci/version.xml scilab/modules/maple2scilab/version.xml scilab/modules/matio/version.xml scilab/modules/mexlib/version.xml scilab/modules/optimization/version.xml scilab/modules/output_stream/version.xml scilab/modules/overloading/version.xml scilab/modules/parameters/version.xml scilab/modules/polynomials/version.xml scilab/modules/pvm/version.xml scilab/modules/randlib/version.xml scilab/modules/renderer/version.xml scilab/modules/scicos/version.xml scilab/modules/scicos_blocks/version.xml scilab/modules/shell/version.xml scilab/modules/signal_processing/version.xml scilab/modules/simulated_annealing/version.xml scilab/modules/sound/version.xml scilab/modules/sparse/version.xml scilab/modules/special_functions/version.xml scilab/modules/spreadsheet/version.xml scilab/modules/statistics/version.xml scilab/modules/string/version.xml scilab/modules/symbolic/version.xml scilab/modules/tclsci/version.xml scilab/modules/texmacs/version.xml scilab/modules/time/version.xml scilab/modules/umfpack/version.xml scilab/modules/windows_tools/version.xml Change-Id: I762b681655c770024c8a6537ce46a45d8aa66b51
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci b/scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci
index 9e68578..4865cc2 100644
--- a/scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci
+++ b/scilab/modules/scicos_blocks/macros/Electrical/Capacitor.sci
@@ -41,7 +41,7 @@ case 'set' then
41 model=arg1.model; 41 model=arg1.model;
42 while %t do 42 while %t do
43 [ok,C,v,exprs]=scicos_getvalue('Set Capacitor block parameter',.. 43 [ok,C,v,exprs]=scicos_getvalue('Set Capacitor block parameter',..
44 ['C (F)','Initial Voltage'],list('vec',1,'vec',1),exprs) 44 ['C (F)';'Initial Voltage'],list('vec',1,'vec',1),exprs)
45 if ~ok then break,end 45 if ~ok then break,end
46 model.rpar=C 46 model.rpar=C
47 model.equations.parameters(2)=list(C,v) 47 model.equations.parameters(2)=list(C,v)