Merge branch 'master' into 'xcos-layout'

Change-Id: I08059fe94df60d9b68962127fa087b08a81ad8a2

diff --cc scilab/CHANGES.md
index 8b5ac28,f7f9365..0113d5c
--- 1/scilab/CHANGES.md
--- 2/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@@ -175,10 -242,15 +242,17 @@@ Data Structure
  Xcos
  ----
  
- * Major rewrite of the data structures, huge models should load and save faster. The memory usage on diagram edition is also slightly reduced.
- * Implicit fixed-size step ODE solver added: Crank-Nicolson 2(3). Added to the CVode package, it also benefits from the CVode rootfinding feature.
- * Optimal Link Style: new link style for automatically finding the optimal route.
- * Split Block Auto Position: automatically reposition split blocks for better-looking layout.
+ * Major rewrite of the data structures, huge models should load and save faster.
+ The memory usage on diagram edition is also slightly reduced.
+ * ZCOS and XCOS file formats have evolved to reduce the duplicated information.
+ Scilab 5.5.2 is able to open the newly saved files, but the ports have to be repositioned manually.
+ * Implicit fixed-size step ODE solver added: Crank-Nicolson 2(3).
+ Added to the CVode package, it also benefits from the CVode rootfinding feature.
++* Added a new link style (`Optimal`) for automatically finding the optimal route.
++* Automatically reposition split blocks for better-looking layout.
+ * Block modifications :
+   - `INVBLK`: add a divide by zero parameter to ignore the error
+   - `PRODUCT`: add a divide by zero parameter to ignore the error
  
  
  API modification

diff --cc scilab/modules/xcos/locales/fr_FR.po
Simple merge

diff --cc scilab/modules/xcos/locales/xcos.pot
Simple merge

diff --cc scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java
Simple merge