summaryrefslogtreecommitdiffstats
path: root/scilab/modules/core
diff options
context:
space:
mode:
authorSerge Steer <serge.steer@scilab.org>2010-03-29 15:00:30 +0200
committerSerge Steer <serge.steer@scilab.org>2010-03-29 15:00:30 +0200
commit480fa546479a45c37f7ade695f665edfd560e9bc (patch)
tree5dae9cab1e03da53ac96ac4d6179d64a171ce6c2 /scilab/modules/core
parentba45021e06bc834392f811e5d90738b04368b51d (diff)
parent30d445336f4567042b7c7746c45ed07b2ed708ea (diff)
downloadscilab-480fa546479a45c37f7ade695f665edfd560e9bc.zip
scilab-480fa546479a45c37f7ade695f665edfd560e9bc.tar.gz
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2
Conflicts: scilab/CHANGES_5.2.X
Diffstat (limited to 'scilab/modules/core')
-rw-r--r--scilab/modules/core/help/en_US/break.xml8
-rw-r--r--scilab/modules/core/help/fr_FR/break.xml8
-rw-r--r--scilab/modules/core/help/pt_BR/break.xml8
3 files changed, 21 insertions, 3 deletions
diff --git a/scilab/modules/core/help/en_US/break.xml b/scilab/modules/core/help/en_US/break.xml
index 932db2e..3497e79 100644
--- a/scilab/modules/core/help/en_US/break.xml
+++ b/scilab/modules/core/help/en_US/break.xml
@@ -16,7 +16,13 @@
16 <refsection> 16 <refsection>
17 <title>Examples</title> 17 <title>Examples</title>
18 <programlisting role="example"><![CDATA[ 18 <programlisting role="example"><![CDATA[
19k=0; while 1==1, k=k+1; if k > 100 then break,end; end 19k=0;
20while 1==1,
21 k=k+1;
22 if k &gt; 100 then
23 break
24 end;
25end
20 ]]></programlisting> 26 ]]></programlisting>
21 </refsection> 27 </refsection>
22 <refsection> 28 <refsection>
diff --git a/scilab/modules/core/help/fr_FR/break.xml b/scilab/modules/core/help/fr_FR/break.xml
index aa0a994..44a4abd 100644
--- a/scilab/modules/core/help/fr_FR/break.xml
+++ b/scilab/modules/core/help/fr_FR/break.xml
@@ -16,7 +16,13 @@
16 <refsection> 16 <refsection>
17 <title>Exemples</title> 17 <title>Exemples</title>
18 <programlisting role="example"><![CDATA[ 18 <programlisting role="example"><![CDATA[
19k=0; while 1==1, k=k+1; if k > 100 then break,end; end 19k=0;
20while 1==1,
21 k=k+1;
22 if k &gt; 100 then
23 break
24 end;
25end
20 ]]></programlisting> 26 ]]></programlisting>
21 </refsection> 27 </refsection>
22 <refsection> 28 <refsection>
diff --git a/scilab/modules/core/help/pt_BR/break.xml b/scilab/modules/core/help/pt_BR/break.xml
index 7003c7e..bfd48f7 100644
--- a/scilab/modules/core/help/pt_BR/break.xml
+++ b/scilab/modules/core/help/pt_BR/break.xml
@@ -28,7 +28,13 @@
28 <title>Exemplos</title> 28 <title>Exemplos</title>
29 29
30 <programlisting role="example"><![CDATA[ 30 <programlisting role="example"><![CDATA[
31k=0; while 1==1, k=k+1; if k &gt; 100 then break,end; end 31k=0;
32while 1==1,
33 k=k+1;
34 if k &gt; 100 then
35 break
36 end;
37end
32 ]]></programlisting> 38 ]]></programlisting>
33 </refsection> 39 </refsection>
34 40