Merge 6.0 into master 80/20380/2
authorClément DAVID <clement.david@esi-group.com>
Mon, 30 Jul 2018 16:48:30 +0000 (18:48 +0200)
committerClément DAVID <clement.david@esi-group.com>
Mon, 30 Jul 2018 16:48:30 +0000 (18:48 +0200)
commitb71aef5a312ccca85e9cd49344ead046cf875ed6
treea17591a993d3404a4351e428239b6253627786c4
parent9591c2d291eb9965279c68842600a1210adbf3c0
parent3b85a5d2b3adec485bf590f6775e13904f6e14ba
Merge 6.0 into master

Change-Id: Iba764091ba95c7a3a501edd6821c86c069d8f2dc
85 files changed:
scilab/bin/scilab
scilab/modules/ast/Makefile.in
scilab/modules/ast/ast.vcxproj
scilab/modules/ast/includes/symbol/context.hxx
scilab/modules/ast/includes/symbol/variables.hxx
scilab/modules/ast/includes/types/string.hxx
scilab/modules/ast/includes/types/struct.hxx
scilab/modules/ast/src/cpp/ast/visitor_common.cpp
scilab/modules/ast/src/cpp/operations/types_power.cpp
scilab/modules/ast/src/cpp/symbol/context.cpp
scilab/modules/ast/src/cpp/symbol/variables.cpp
scilab/modules/ast/src/cpp/types/sparse.cpp
scilab/modules/ast/src/cpp/types/string.cpp
scilab/modules/ast/src/cpp/types/struct.cpp
scilab/modules/ast/src/cpp/types/types_tools.cpp
scilab/modules/boolean/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/src/cpp/mgetl.cpp
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/gui/src/java/org/scilab/modules/gui/tabfactory/ScilabTabFactory.java
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/io/Makefile.in
scilab/modules/io/src/c/io.vcxproj
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/fortran/linear_algebra_f2c.vcxproj
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/localization.vcxproj
scilab/modules/matio/matio.vcxproj
scilab/modules/mexlib/src/cpp/mexlib.cpp
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/cpp/scilab_sprintf.cpp
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/polynomials/src/fortran/polynomials_f2c.vcxproj
scilab/modules/preferences/Makefile.in
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/scicos/macros/scicos_scicos/c_pass2.sci
scilab/modules/scicos/sci_gateway/cpp/sci_scicosim.cpp
scilab/modules/scicos/src/cpp/view_scilab/BaseAdapter.hxx
scilab/modules/scicos/src/cpp/view_scilab/BlockAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/DiagramAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/GraphicsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/LinkAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.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/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/slint/src/cpp/DeprecatedChecker.cpp
scilab/modules/sparse/sci_gateway/cpp/sci_sparse.cpp
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcxproj
scilab/modules/time/Makefile.in
scilab/modules/time/time.vcxproj
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java