summaryrefslogtreecommitdiffstats
path: root/scilab/modules/output_stream
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-12 11:10:06 +0100
commit10963c0a56109ddafb6f2f4a8dbdc925b00ac69c (patch)
tree9f8eefbac0a88917328855a3cf4c046f4e7ca719 /scilab/modules/output_stream
parentbc7b15143690a57f6ee6d6ec9401227e77b18db4 (diff)
parentc8b337d77b6d3f040afc6a76b9c607a838ae62dd (diff)
downloadscilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.zip
scilab-10963c0a56109ddafb6f2f4a8dbdc925b00ac69c.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
Diffstat (limited to 'scilab/modules/output_stream')
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/output_stream/help/en_US/ssprint.xml7
-rw-r--r--scilab/modules/output_stream/help/pt_BR/ssprint.xml7
3 files changed, 1 insertions, 14 deletions
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 271f177..613b808 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -275,6 +275,7 @@ LD = @LD@
275LDFLAGS = @LDFLAGS@ 275LDFLAGS = @LDFLAGS@
276LIBICONV = @LIBICONV@ 276LIBICONV = @LIBICONV@
277LIBINTL = @LIBINTL@ 277LIBINTL = @LIBINTL@
278LIBM = @LIBM@
278LIBOBJS = @LIBOBJS@ 279LIBOBJS = @LIBOBJS@
279LIBS = @LIBS@ 280LIBS = @LIBS@
280LIBTOOL = @LIBTOOL@ 281LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/output_stream/help/en_US/ssprint.xml b/scilab/modules/output_stream/help/en_US/ssprint.xml
index b3df803..4873ccd 100644
--- a/scilab/modules/output_stream/help/en_US/ssprint.xml
+++ b/scilab/modules/output_stream/help/en_US/ssprint.xml
@@ -72,11 +72,4 @@ ssprint(syslin('d',a,b,c,d))
72 ]]></programlisting> 72 ]]></programlisting>
73 </refsection> 73 </refsection>
74 74
75 <refsection>
76 <title>See Also</title>
77
78 <simplelist type="inline">
79 <member><link linkend="texprint">texprint</link></member>
80 </simplelist>
81 </refsection>
82</refentry> 75</refentry>
diff --git a/scilab/modules/output_stream/help/pt_BR/ssprint.xml b/scilab/modules/output_stream/help/pt_BR/ssprint.xml
index d2cf763..6f9929f 100644
--- a/scilab/modules/output_stream/help/pt_BR/ssprint.xml
+++ b/scilab/modules/output_stream/help/pt_BR/ssprint.xml
@@ -72,11 +72,4 @@ ssprint(syslin('d',a,b,c,d))
72 ]]></programlisting> 72 ]]></programlisting>
73 </refsection> 73 </refsection>
74 74
75 <refsection>
76 <title>Ver Também</title>
77
78 <simplelist type="inline">
79 <member><link linkend="texprint">texprint</link></member>
80 </simplelist>
81 </refsection>
82</refentry> 75</refentry>