summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci/help
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-07 10:25:41 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-07 10:37:10 +0100
commit1de9fa2f978a5820f818b48d9d500af204ec9da8 (patch)
tree403a34f945586a452106e0d83784584440feb6da /scilab/modules/intersci/help
parent2835e08091d79405f8a4ef74787b5aace3e935ab (diff)
parent77dd731c7106bcb6043a597c9bade2a12c11d1fe (diff)
downloadscilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.zip
scilab-1de9fa2f978a5820f818b48d9d500af204ec9da8.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/Makefile.in scilab/aclocal.m4 scilab/build.incl.xml scilab/configure scilab/contrib/Makefile.in scilab/libs/MALLOC/Makefile.in scilab/libs/Makefile.in scilab/libs/doublylinkedlist/Makefile.in scilab/libs/dynamiclibrary/Makefile.in scilab/libs/hashtable/Makefile.in scilab/libs/libst/Makefile.in scilab/modules/Makefile.in scilab/modules/action_binding/Makefile.in scilab/modules/api_scilab/Makefile.in scilab/modules/arnoldi/Makefile.in scilab/modules/atoms/Makefile.in scilab/modules/boolean/Makefile.in scilab/modules/cacsd/Makefile.in scilab/modules/call_scilab/Makefile.in scilab/modules/commons/Makefile.in scilab/modules/compatibility_functions/Makefile.in scilab/modules/completion/Makefile.in scilab/modules/console/Makefile.in scilab/modules/core/Makefile.in scilab/modules/data_structures/Makefile.in scilab/modules/demo_tools/Makefile.in scilab/modules/development_tools/Makefile.in scilab/modules/development_tools/src/fake/Makefile.in scilab/modules/differential_equations/Makefile.in scilab/modules/double/Makefile.in scilab/modules/dynamic_link/Makefile.in scilab/modules/elementary_functions/Makefile.in scilab/modules/fftw/Makefile.in scilab/modules/fileio/Makefile.in scilab/modules/functions/Makefile.in scilab/modules/genetic_algorithms/Makefile.in scilab/modules/graph/Makefile.in scilab/modules/graphic_export/Makefile.in scilab/modules/graphics/Makefile.in scilab/modules/gui/Makefile.in scilab/modules/hdf5/Makefile.in scilab/modules/helptools/Makefile.in scilab/modules/history_browser/Makefile.in scilab/modules/history_manager/Makefile.in scilab/modules/integer/Makefile.in scilab/modules/interpolation/Makefile.in scilab/modules/intersci/Makefile.in scilab/modules/io/Makefile.in scilab/modules/javasci/Makefile.in scilab/modules/jvm/Makefile.in scilab/modules/linear_algebra/Makefile.in scilab/modules/localization/Makefile.in scilab/modules/m2sci/Makefile.in scilab/modules/maple2scilab/Makefile.in scilab/modules/matio/Makefile.in scilab/modules/mexlib/Makefile.in scilab/modules/modules_manager/Makefile.in scilab/modules/optimization/Makefile.in scilab/modules/output_stream/Makefile.in scilab/modules/overloading/Makefile.in scilab/modules/parallel/Makefile.in scilab/modules/parameters/Makefile.in scilab/modules/polynomials/Makefile.in scilab/modules/pvm/Makefile.in scilab/modules/randlib/Makefile.in scilab/modules/renderer/Makefile.in scilab/modules/scicos/Makefile.in scilab/modules/scicos_blocks/Makefile.in scilab/modules/scinotes/Makefile.in scilab/modules/shell/Makefile.in scilab/modules/signal_processing/Makefile.in scilab/modules/simulated_annealing/Makefile.in scilab/modules/sound/Makefile.in scilab/modules/sparse/Makefile.in scilab/modules/special_functions/Makefile.in scilab/modules/spreadsheet/Makefile.in scilab/modules/statistics/Makefile.in scilab/modules/string/Makefile.in scilab/modules/symbolic/Makefile.in scilab/modules/tclsci/Makefile.in scilab/modules/texmacs/Makefile.in scilab/modules/time/Makefile.in scilab/modules/types/Makefile.in scilab/modules/ui_data/Makefile.in scilab/modules/umfpack/Makefile.in scilab/modules/windows_tools/Makefile.in scilab/modules/xcos/Makefile.in Change-Id: I7fc05b70adca908a233ce3c191516df161cebf1e
Diffstat (limited to 'scilab/modules/intersci/help')
-rw-r--r--scilab/modules/intersci/help/en_US/intersci.xml4
-rwxr-xr-xscilab/modules/intersci/help/ja_JP/addchapter.sce11
2 files changed, 13 insertions, 2 deletions
diff --git a/scilab/modules/intersci/help/en_US/intersci.xml b/scilab/modules/intersci/help/en_US/intersci.xml
index e858b9b..5a9be97 100644
--- a/scilab/modules/intersci/help/en_US/intersci.xml
+++ b/scilab/modules/intersci/help/en_US/intersci.xml
@@ -39,8 +39,8 @@
39 <para>Refer to intersci documentation for more details.</para> 39 <para>Refer to intersci documentation for more details.</para>
40 <para>Note that this feature is obsolete and unsupported and will be replaced by a Scilab SWIG wrapper in an upcoming version.</para> 40 <para>Note that this feature is obsolete and unsupported and will be replaced by a Scilab SWIG wrapper in an upcoming version.</para>
41 </refsection> 41 </refsection>
42 <refsection> 42 <refsection role="see also">
43 <title>See Also</title> 43<title>See Also</title>
44 <simplelist type="inline"> 44 <simplelist type="inline">
45 <member> 45 <member>
46 <link linkend="fort">fort</link> 46 <link linkend="fort">fort</link>
diff --git a/scilab/modules/intersci/help/ja_JP/addchapter.sce b/scilab/modules/intersci/help/ja_JP/addchapter.sce
new file mode 100755
index 0000000..0601d20
--- /dev/null
+++ b/scilab/modules/intersci/help/ja_JP/addchapter.sce
@@ -0,0 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2009 - DIGITEO
3//
4// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which
6// you should have received as part of this distribution. The terms
7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9
10add_help_chapter("Intersci",SCI+"/modules/intersci/help/ja_JP",%T);
11