Merge remote-tracking branch 'origin/6.1'

Change-Id: I5d26fc380a28efe0bb6d0096fe9684b274b55bfe

diff --cc scilab/CHANGES.md
index cd04a9d,03550ed..1402dda
--- 1/scilab/CHANGES.md
--- 2/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@@ -281,18 -325,25 +325,29 @@@ Known issue
  Bug Fixes
  ---------
  
 +### Bugs fixed in 6.2.0:
 +
 +
  ### Bugs fixed in 6.1.1:
 +
  * [#3188](https://bugzilla.scilab.org/3188): `part()` was slower than in Scilab 4.1.2.
- * [#7117](https://bugzilla.scilab.org/7117): `findobj()` could not search within given object.
+ * [#4648](https://bugzilla.scilab.org/4648): Scilab missed more secure hashing functions (md5 is now broken)
+ * [#5511](https://bugzilla.scilab.org/5511): printf_conversion page was poorly presented and had many issues: The described types of accepted value and printed result were often switched; nothing was told about the processing of complex numbers; special escaped sequences \n \r \t \\ were not described; possible numbering of placeholders was not described; in the pt_BR version, the itemized lists were wrongly unnested and characters typing placeholders (d,u,o,x,f,e,g..) were missing.
+ * [#7202](https://bugzilla.scilab.org/7202): It was not possible to send string parameters via the opar structure of an xcos block to a block of type 4.
  * [#8059](https://bugzilla.scilab.org/8059): A local `.wgetrc` config file could make troubles in `atomsDownload`.
+ * [#8100](https://bugzilla.scilab.org/8100): `cumsum()` on sparse documented.
  * [#8378](https://bugzilla.scilab.org/8378): Datatip `ContextMenu => Delete last datatip` was useless.
+ * [#8761](https://bugzilla.scilab.org/8761): Xcos masked superblocks had invalid names.
  * [#9221](https://bugzilla.scilab.org/9221): There was no way in Scilab to easily access to sets of unicode symbols like greek letters, etc.
  * [#9909](https://bugzilla.scilab.org/9909): In the help browser, add a way to open the online version of the current page.
+ * [#10046](https://bugzilla.scilab.org/10046): By default, the `MAXMIN` block did not propose 2 input ports to work in an element-wise way (unlike MIN_f and MAX_f), which is its most original working mode.
+ * [#10465](https://bugzilla.scilab.org/10465): At Scilab exit, the help browser is not saved nor restored.
  * [#10476](https://bugzilla.scilab.org/10476): From `browsevar`, displaying the content of lists, structures, cells, or other custom tlists or mlists was not possible.
+ * [#10490](https://bugzilla.scilab.org/10490): The `mapsound` page was poor with a single interesting example.
+ * [#10964](https://bugzilla.scilab.org/10964): Scinotes coud not execute the current file in NW mode.
+ * [#11600](https://bugzilla.scilab.org/11600): `rand()` was parsing its inputs incorrectly.
+ * [#11677](https://bugzilla.scilab.org/11677): The original Arnoldi functions were obsolete.
+ * [#11888](https://bugzilla.scilab.org/11888): The `struct` page did not document how to build an array of structures.
  * [#12418](https://bugzilla.scilab.org/12418): Using bvode() with "continuation", i.e. `ipar(9) > 1` led to an error.
  * [#12516](https://bugzilla.scilab.org/12516): From `browsevar`, clicking on any graphical handle did not edit its figure with `ged`.
  * [#12532](https://bugzilla.scilab.org/12532): From `browsevar`, clicking on any function did not edit it with `edit`. The content of libraries could not be displayed either.

diff --cc scilab/configure.ac
Simple merge

diff --cc scilab/modules/core/includes/version.h.in
index ee4bb4c,6ca905f..b0d9a6c
--- 1/scilab/modules/core/includes/version.h.in
--- 2/scilab/modules/core/includes/version.h.in
+++ b/scilab/modules/core/includes/version.h.in
@@@ -18,11 -18,12 +18,12 @@@
  #define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@
  #define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@
  #define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@
 -#define SCI_VERSION_STRING "scilab-branch-6.1"
 -#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.1"
 +#define SCI_VERSION_STRING "scilab-branch-6.2"
 +#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.2"
- /* SCI_VERSION_REVISION --> hash key commit */
- #define SCI_VERSION_REVISION 0
- #define SCI_VERSION_TIMESTAMP 0
+ 
+ /* hash key commit and commit date set to the first Scilab commit and will be updated by the Compilation Chain */
+ #define SCI_VERSION_REVISION "0cc09d1c9c20db1f7e531e4317d11a4117ce8cf5"
+ #define SCI_VERSION_TIMESTAMP 988271013
  
  void disp_scilab_version(void);
  

diff --cc scilab/modules/core/includes/version.h.vc
index 51d4ddc,8b060b6..5d4aa5e
--- 1/scilab/modules/core/includes/version.h.vc
--- 2/scilab/modules/core/includes/version.h.vc
+++ b/scilab/modules/core/includes/version.h.vc
@@@ -16,13 -16,14 +16,14 @@@
  #define SCI_VERSION_H
  
  #define SCI_VERSION_MAJOR 6
 -#define SCI_VERSION_MINOR 1
 -#define SCI_VERSION_MAINTENANCE 1
 -#define SCI_VERSION_STRING "scilab-branch-6.1"
 -#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.1"
 +#define SCI_VERSION_MINOR 2
 +#define SCI_VERSION_MAINTENANCE 0
 +#define SCI_VERSION_STRING "scilab-branch-6.2"
 +#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.2"
- /* SCI_VERSION_REVISION --> hash key commit */
- #define SCI_VERSION_REVISION 0
- #define SCI_VERSION_TIMESTAMP 0
+ 
+ /* hash key commit and commit date set to the first Scilab commit and will be updated by the Compilation Chain */
+ #define SCI_VERSION_REVISION "0cc09d1c9c20db1f7e531e4317d11a4117ce8cf5"
+ #define SCI_VERSION_TIMESTAMP 988271013
  
  void disp_scilab_version(void);