merge origin/6.0 into master 35/20835/1
authorClément DAVID <clement.david@esi-group.com>
Mon, 11 Feb 2019 22:09:04 +0000 (23:09 +0100)
committerClément DAVID <clement.david@esi-group.com>
Mon, 11 Feb 2019 22:09:19 +0000 (23:09 +0100)
commit067559de1d6a0dbde228fcbc43228423323ee6cb
tree5e633e5c338b03c5548294ed67405f594f3743d2
parentb0cc05ff510a636e93c2c4da291fa0a95d7871ef
parent07514bcb990668f85788e20b6046a6ba7d84e3dd
merge origin/6.0 into master

Change-Id: I61aa867c78a95fc3265eade726c4e9c7fd2c21d0
45 files changed:
scilab/bin/scilab
scilab/modules/ast/src/cpp/ast/visitor_common.cpp
scilab/modules/ast/src/cpp/parse/bison/parsescilab.output
scilab/modules/ast/src/cpp/parse/flex/scanscilab.ll
scilab/modules/ast/src/cpp/parse/scanscilab.cpp
scilab/modules/ast/src/cpp/symbol/variables.cpp
scilab/modules/ast/src/cpp/types/cell.cpp
scilab/modules/ast/src/cpp/types/overload.cpp
scilab/modules/ast/src/cpp/types/sparse.cpp
scilab/modules/ast/src/cpp/types/types_tools.cpp
scilab/modules/data_structures/sci_gateway/cpp/sci_getfield.cpp
scilab/modules/development_tools/data/test_run_level.xml
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/etc/images_md5.txt
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/LaTeXImageConverter.java
scilab/modules/io/sci_gateway/cpp/sci_genlib.cpp
scilab/modules/linear_algebra/sci_gateway/cpp/sci_rcond.cpp
scilab/modules/preferences/help/en_US/getPreferencesValue.xml
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/sci_gateway/cpp/sci_grand.cpp
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/sci_gateway/cpp/sci_model2blk.cpp
scilab/modules/scicos/sci_gateway/cpp/sci_scicosim.cpp
scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/cpp/view_scilab/BaseAdapter.hxx
scilab/modules/scicos/src/cpp/view_scilab/DiagramAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/GraphicsAdapter.cpp
scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
scilab/modules/scicos/tests/unit_tests/model/from_mlist.dia.ref
scilab/modules/scicos/tests/unit_tests/scicos_new.dia.ref
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/slint/src/cpp/DeprecatedChecker.cpp
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
scilab/modules/xcos/help/en_US/palettes/Signalrouting_pal/M_SWITCH.xml
scilab/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/writer/CustomWriter.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/BlockPositioning.java