summaryrefslogtreecommitdiffstats
path: root/scilab/modules/types
diff options
context:
space:
mode:
authorClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
committerClément David <clement.david@esi-group.com>2021-07-15 15:50:48 +0200
commit81a9cc049332de0c712cf56da585fcd25c8e59e3 (patch)
treef365c25a05c1782a16b2985bf7481116c106952d /scilab/modules/types
parentb0937f19e4b8ddf416ca9a9a433bcbbd3f4ef2c0 (diff)
parent90b4ecb9b57ac6ad4e00d4a99b0d8bd1a6424403 (diff)
downloadscilab-master.zip
scilab-master.tar.gz
Merge remote-tracking branch 'origin/6.1'HEADmaster
Change-Id: I5d26fc380a28efe0bb6d0096fe9684b274b55bfe
Diffstat (limited to 'scilab/modules/types')
-rw-r--r--scilab/modules/types/Makefile.in2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/package.html8
2 files changed, 6 insertions, 4 deletions
diff --git a/scilab/modules/types/Makefile.in b/scilab/modules/types/Makefile.in
index 5f1b8a2..347cfa7 100644
--- a/scilab/modules/types/Makefile.in
+++ b/scilab/modules/types/Makefile.in
@@ -469,9 +469,11 @@ NMEDIT = @NMEDIT@
469OBJDUMP = @OBJDUMP@ 469OBJDUMP = @OBJDUMP@
470OBJEXT = @OBJEXT@ 470OBJEXT = @OBJEXT@
471OCAMLC = @OCAMLC@ 471OCAMLC = @OCAMLC@
472OCAMLCFLAGS = @OCAMLCFLAGS@
472OCAMLDEP = @OCAMLDEP@ 473OCAMLDEP = @OCAMLDEP@
473OCAMLLEX = @OCAMLLEX@ 474OCAMLLEX = @OCAMLLEX@
474OCAMLOPT = @OCAMLOPT@ 475OCAMLOPT = @OCAMLOPT@
476OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
475OCAMLYACC = @OCAMLYACC@ 477OCAMLYACC = @OCAMLYACC@
476OPENMPI_CC = @OPENMPI_CC@ 478OPENMPI_CC = @OPENMPI_CC@
477OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ 479OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/package.html b/scilab/modules/types/src/java/org/scilab/modules/types/package.html
index 7deea29..926a944 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/package.html
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/package.html
@@ -1,11 +1,11 @@
1<html> 1<html>
2<body> 2<body>
3This package provides a representation of most of the Scilab datatypes.<br /> 3This package provides a representation of most of the Scilab datatypes.<br>
4<br /> 4<br>
5 5
6Example:<br /> 6Example:<br>
7<code> 7<code>
8double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br /> 8double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
9ScilabDouble aMatrix = new ScilabDouble(a); 9ScilabDouble aMatrix = new ScilabDouble(a);
10</code> 10</code>
11</body> 11</body>