merge 6.0 branch into master 90/19790/1
authorClément DAVID <clement.david@esi-group.com>
Mon, 19 Feb 2018 12:27:42 +0000 (13:27 +0100)
committerClément DAVID <clement.david@esi-group.com>
Mon, 19 Feb 2018 16:01:55 +0000 (17:01 +0100)
commit9d24704b6a4f40170ab7ef8a552b4e71891182b6
tree6890730b6e6180f28812103d51de6b158e3373a1
parent6b999c51019a9617ed63e3ee873b5d93a953b2e6
parent3f95fda6ef54821ad6f2c009898e2c2b2a82731a
merge 6.0 branch into master

Change-Id: I9c84b59c6dc2097d3108d00d269ffeffd277ddd1
60 files changed:
scilab/CHANGES.md
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/ast/includes/types/types.hxx
scilab/modules/atoms/locales/atoms.pot
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/help/en_US/linear_system_representation/zpk.xml
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/development_tools/macros/bench_run.sci
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
scilab/modules/dynamic_link/src/scripts/Makefile.in
scilab/modules/dynamic_link/src/scripts/configure
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/functions/scripts/buildmacros/BuildMacros.vcxproj
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/locales/graphics.pot
scilab/modules/gui/sci_gateway/cpp/sci_uigetfont.cpp
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/data/pages/CHANGES.html
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/locales/helptools.pot
scilab/modules/helptools/src/BuildHelp.vcxproj
scilab/modules/interpolation/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/help/en_US/optimsimplex/optimsimplex_overview.xml
scilab/modules/optimization/locales/optimization.pot
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/cpp/scilab_sprintf.cpp
scilab/modules/polynomials/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/slint/locales/slint.pot
scilab/modules/slint/src/cpp/DeprecatedChecker.cpp
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/umfpack/locales/umfpack.pot
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/help/en_US/batch_functions/xcos_simulate.xml
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToScilab.cpp
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/BlockPositioning.java
scilab/modules/xml/help/ja_JP/xmlXPath.xml
scilab/tools/localization/generatePoFile.vcxproj