Merge remote-tracking branch 'origin/master' into YaSp 65/19365/1
Antoine ELIAS [Thu, 10 Aug 2017 08:24:15 +0000 (10:24 +0200)]
Change-Id: I7c3ffdbf4cb7861176d669ff7b283e8f746079e9

1  2 
scilab/configure.ac
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc

Simple merge