Merge branch 'master' into 'xcos-layout' 13/18813/1 xcos-layout
authorClément DAVID <clement.david@scilab-enterprises.com>
Fri, 23 Dec 2016 07:25:54 +0000 (08:25 +0100)
committerClément DAVID <clement.david@scilab-enterprises.com>
Fri, 23 Dec 2016 07:27:22 +0000 (08:27 +0100)
commit4a146724a7cb75fae8cd78ce332715571f521ce1
tree8fd15c01469d692d6c4352e1d423023ab77c89f1
parentc1ed74c9746f8d27f83b1858dda62956a68f8c2d
parent21a5e63591341218af5573c6773a3e090ae07344
Merge branch 'master' into 'xcos-layout'

Change-Id: I08059fe94df60d9b68962127fa087b08a81ad8a2
scilab/CHANGES.md
scilab/modules/xcos/locales/fr_FR.po
scilab/modules/xcos/locales/xcos.pot
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java