X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2FCHANGES.md;h=960105c92aef3802cc66b0783c11af18a38348fe;hp=08399fcc13074cafce7d8330322f4c975fff6329;hb=c3bfb2899804b4f229f30e35670f8c43285c9a43;hpb=e2d0fd91c0fed29d65cc67500b7d719b6a7b7dd6

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 08399fc..960105c 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -201,7 +201,6 @@ Feature changes and additions on 6.1.1
   - It can now sort any sparse 2D matrix, in all `g, r, c, lr, lc` methods, including sparse booleans and in multi-level mode. It was formerly limited to sparse real or complex vectors and only to the `g` mode.
   - Any hypermatrix can be sorted along a dimension > 2.
 * `unique` is enabled for any 2D sparse arrays, in simple, 'c' and 'r' modes.
-<<<<<<< HEAD
 * `%chars` constant added, to easily access to some selected sets of unicode symbols.
 * Lists are displayed in a more compact and comprehensive way.
 * `interp1` is upgraded:
@@ -226,11 +225,8 @@ Feature changes and additions on 6.1.1
 * `close` is extended to close the help browser, xcos, or the variables browser or editor GUIs.
 * `polyint` is introduced to compute polynomial antiderivatives.
 * Listbox uicontrol callback is now triggered by item click in single selection mode. For example, it allows successive execution of a demo in the demonstrations gui.
-
-=======
-* %chars constant added, to easily access to some selected sets of unicode symbols.
 * `det` is now actually extended to sparse matrices.
->>>>>>> 608020c6bbd (* Bug 16636 fixed: det(sparse) now actually implemented)
+
 
 Help pages:
 -----------
@@ -434,6 +430,7 @@ Bug Fixes
 * [#16631](https://bugzilla.scilab.org/16631): read-only handle properties were reported as unknown when trying to set them.
 * [#16632](https://bugzilla.scilab.org/16632): Scilab did not start with unsupported locale on macOS.
 * [#16636](https://bugzilla.scilab.org/16636): `det(sparse)` most often yielded `Nan`. `[e,m]=det(sparse)` was not actually implemented.
+* [#16638](https://bugzilla.scilab.org/16638): `getcolor` shew a bunch of issues.
 * [#16644](https://bugzilla.scilab.org/16644): `input("message:")` yielded a wrong error message about `mprintf` in case of non-interpretable input.
 * [#16654](https://bugzilla.scilab.org/16654): `interp` was leaking memory.