From e8345d23b3b8e7173e7ceb67c525c6ad83c247a1 Mon Sep 17 00:00:00 2001 From: Samuel GOUGEON Date: Thu, 21 Feb 2019 02:59:14 +0100 Subject: [PATCH] * Bug 15969 fixed: typo in bug_13962.tst http://bugzilla.scilab.org/15969 Change-Id: Ibb582cad331fb1237bc89118a192c6614032fa40 --- scilab/CHANGES.md | 1 + scilab/COPYING | 2 +- .../modules/gui/tests/nonreg_tests/bug_13962.tst | 2 +- scilab/modules/scirenderer/COPYING | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md index d4dee33..ac91779 100644 --- a/scilab/CHANGES.md +++ b/scilab/CHANGES.md @@ -212,6 +212,7 @@ Bug Fixes * [#15812](http://bugzilla.scilab.org/show_bug.cgi?id=15812): On assigning variables the source variable may become become corrupted * [#15840](http://bugzilla.scilab.org/show_bug.cgi?id=15840): `grand(1,"prm",m)` yielded an unsqueezed size([size(m) 1]) hypermatrix * [#15964](http://bugzilla.scilab.org/show_bug.cgi?id=15954): A complex empty sparse matrix could be obtained after insertion. +* [#15969](http://bugzilla.scilab.org/show_bug.cgi?id=15969): Fix spelling * [#15974](http://bugzilla.scilab.org/show_bug.cgi?id=15974): `msprintf("%d", %nan)` did not return Nan * [#15983](http://bugzilla.scilab.org/show_bug.cgi?id=15983): `group()` regressed in 5.5.2 due to a too intrusive fix. * [#15984](http://bugzilla.scilab.org/show_bug.cgi?id=15984): display scale was wrong with Retina dispplays on OSX.. diff --git a/scilab/COPYING b/scilab/COPYING index 5264b5b..77752b7 100644 --- a/scilab/COPYING +++ b/scilab/COPYING @@ -729,7 +729,7 @@ However, the Licensor is entitled to offer this type of services. The terms and conditions of such technical assistance, and/or such maintenance, shall be set forth in a separate instrument. Only the Licensor offering said maintenance and/or technical assistance services -shall incur liability therefor. +shall incur liability therefore. 7.2 Similarly, any Licensor is entitled to offer to its licensees, under its sole responsibility, a warranty, that shall only be binding upon diff --git a/scilab/modules/gui/tests/nonreg_tests/bug_13962.tst b/scilab/modules/gui/tests/nonreg_tests/bug_13962.tst index 15393cb..194a5a8 100644 --- a/scilab/modules/gui/tests/nonreg_tests/bug_13962.tst +++ b/scilab/modules/gui/tests/nonreg_tests/bug_13962.tst @@ -15,7 +15,7 @@ // http://bugzilla.scilab.org/13962 // // <-- Short Description --> -// If the groupname and value properties were setted to radiobutton creation, +// If the groupname and value properties were set to radiobutton creation, // then it was only selected at the first execution. function test() diff --git a/scilab/modules/scirenderer/COPYING b/scilab/modules/scirenderer/COPYING index fcc8df2..febabfb 100644 --- a/scilab/modules/scirenderer/COPYING +++ b/scilab/modules/scirenderer/COPYING @@ -19,7 +19,7 @@ the two main principles guiding its drafting: The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) license are: -Commissariat à l'Energie Atomique - CEA, a public scientific, technical +Commissariat à l'Energie Atomique - CEA, a public scientific, technical and industrial research establishment, having its principal place of business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. @@ -327,7 +327,7 @@ The Licensee expressly undertakes: The Licensee undertakes not to directly or indirectly infringe the intellectual property rights of the Holder and/or Contributors on the -Software and to take, where applicable, vis-à-vis its staff, any and all +Software and to take, where applicable, vis-à-vis its staff, any and all measures required to ensure respect of said intellectual property rights of the Holder and/or Contributors. @@ -341,7 +341,7 @@ However, the Licensor is entitled to offer this type of services. The terms and conditions of such technical assistance, and/or such maintenance, shall be set forth in a separate instrument. Only the Licensor offering said maintenance and/or technical assistance services -shall incur liability therefor. +shall incur liability therefore. 7.2 Similarly, any Licensor is entitled to offer to its licensees, under its sole responsibility, a warranty, that shall only be binding upon -- 1.7.9.5