merge 6.0 into master 63/19063/3
authorClément DAVID <clement.david@scilab-enterprises.com>
Thu, 9 Feb 2017 08:04:06 +0000 (09:04 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 9 Feb 2017 08:26:31 +0000 (09:26 +0100)
commit97b14661ee187ffaed860e07a84f33fec32fef32
tree1690215472ade41ad8f6e0ede3a4002c61261f75
parent217c5dfef9dd24a37b28656c53e49e5d30eaa4ee
parenta30c92cf96b68c0a3c1b00fa02219e9f9a81fe3d
merge 6.0 into master

Change-Id: Ib094d7f04a299c65eab6aa28deae0c3c72b6f0ba
scilab/CHANGES.md
scilab/configure
scilab/configure.ac
scilab/modules/atoms/etc/repositories
scilab/modules/atoms/tests/unit_tests/repositories.orig
scilab/modules/core/includes/version.h.vc