summaryrefslogtreecommitdiffstats
path: root/scilab/modules/differential_equations
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab.org>2009-12-18 14:09:22 +0100
committerAntoine ELIAS <antoine.elias@scilab.org>2009-12-18 14:09:22 +0100
commit067acaabfb6226d92665ed23e8dfb147310de8c3 (patch)
tree0503cc80d14061b9216708a1b9c038157b0bdeab /scilab/modules/differential_equations
parent2512e7c5a3acd3bc0a4550dfd03c2f7299a78ce6 (diff)
parent41f2e94eb7d7130e97bdfcd1011818cc409d359e (diff)
downloadscilab-067acaabfb6226d92665ed23e8dfb147310de8c3.zip
scilab-067acaabfb6226d92665ed23e8dfb147310de8c3.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java
Diffstat (limited to 'scilab/modules/differential_equations')
-rw-r--r--scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce b/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
index 7db14b3..ab5082c 100644
--- a/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
+++ b/scilab/modules/differential_equations/demos/wheel/wheel2.dem.sce
@@ -55,7 +55,7 @@ while flag==2, [n1,n2]=size(x);
55 x0 = evstr(x_mdialog(['Initial conditions'],ystr,string(x(:,n2)))); 55 x0 = evstr(x_mdialog(['Initial conditions'],ystr,string(x(:,n2))));
56 x = ode(x0,tmin,times,'wheel'); 56 x = ode(x0,tmin,times,'wheel');
57 clf(my_handle,"reset"); 57 clf(my_handle,"reset");
58 show(x); 58 wheel_show(x);
59 end 59 end
60end 60end
61 61