Merge remote-tracking branch 'origin/6.0' 07/20507/1
Antoine ELIAS [Wed, 19 Sep 2018 15:56:57 +0000 (17:56 +0200)]
Change-Id: I461420f0cc84e6bb0a4cd731dea7328e2afceb0d

12 files changed:
1  2 
scilab/modules/ast/src/cpp/ast/visitor_common.cpp
scilab/modules/elementary_functions/sci_gateway/cpp/sci_max.cpp
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/io/sci_gateway/cpp/sci_genlib.cpp
scilab/modules/linear_algebra/sci_gateway/cpp/sci_qr.cpp
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/mexlib/src/cpp/mexlib.cpp
scilab/modules/output_stream/src/cpp/scilab_sprintf.cpp
scilab/modules/xcos/etc/palettes.xml
scilab/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java

Simple merge
Simple merge
                  </imageobject>
              </inlinemediaobject>
          </link>
+               <para/>
+     </refsection>
+     <refsection id="Seealso_CMSCOPE" role="see also">
+         <title>See also</title>
+         <simplelist type="inline">
+             <member>
+                 <link linkend="CSCOPE">CSCOPE</link>
+             </member>
+             <member>
+                 <link linkend="CFSCOPE">CFSCOPE</link>
+             </member>
+             <member>
+                 <link linkend="CSCOPXY">CSCOPXY</link>
+             </member>
+             <member>
+                 <link linkend="CSCOPXY3D">CSCOPXY3D</link>
+             </member>
+         </simplelist>
      </refsection>
 +    <refsection id="Seealso_CMSCOPE">
 +        <title>See also</title>
 +        <itemizedlist>
 +            <listitem>
 +                <para>
 +                    <link linkend="SCALE_CMSCOPE">SCALE_CMSCOPE - Multi display scope with autoscale feature of graph</link>
 +                </para>
 +            </listitem>
 +        </itemizedlist>
 +    </refsection>
  </refentry>