Merge remote-tracking branch 'origin/master' into YaSp 65/19365/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 10 Aug 2017 08:24:15 +0000 (10:24 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 10 Aug 2017 08:24:15 +0000 (10:24 +0200)
commit7548ee183afb7db4543667a6231f6a7d10a84068
tree8e786ca826debcfd2aca97524a03b6c5d524fc87
parent712380abef8d1e85f1b5808bea8fe64f8e7970bd
parent0fcc049d839e11504cc4a0b801297086e2732e03
Merge remote-tracking branch 'origin/master' into YaSp

Change-Id: I7c3ffdbf4cb7861176d669ff7b283e8f746079e9
scilab/configure.ac
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc