merge 6.0 into master 99/19899/2
authorClément DAVID <clement.david@esi-group.com>
Wed, 21 Mar 2018 07:35:22 +0000 (08:35 +0100)
committerClément DAVID <clement.david@esi-group.com>
Wed, 21 Mar 2018 07:35:22 +0000 (08:35 +0100)
commit99d1b4e8098209fb885960f22098756c0eb07f37
tree8b1f8696e64cebc76ef25bfb22d27192d7051bdc
parentb3c5c4a3c664e184912219c0adcb1eb7a2658df8
parent388a66256a656327e87b845f2e4b94c500f4a17a
merge 6.0 into master

Change-Id: I6fcf881bc224fab7a8638b1ff94d4f5aceb6176b
17 files changed:
scilab/CHANGES.md
scilab/configure
scilab/configure.ac
scilab/modules/ast/src/cpp/types/sparse.cpp
scilab/modules/atoms/locales/atoms.pot
scilab/modules/cacsd/locales/cacsd.pot
scilab/modules/differential_equations/locales/differential_equations.pot
scilab/modules/graphics/locales/graphics.pot
scilab/modules/helptools/locales/helptools.pot
scilab/modules/m2sci/locales/m2sci.pot
scilab/modules/optimization/locales/optimization.pot
scilab/modules/scicos/locales/scicos.pot
scilab/modules/scinotes/locales/scinotes.pot
scilab/modules/signal_processing/locales/signal_processing.pot
scilab/modules/slint/locales/slint.pot
scilab/modules/string/src/c/strsubst.c
scilab/modules/umfpack/locales/umfpack.pot