Merge remote-tracking branch 'origin/master' into jit 95/17195/1
Antoine ELIAS [Fri, 11 Sep 2015 14:46:29 +0000 (16:46 +0200)]
Change-Id: Ifdb2ae5bc80a282ce64401db7b74f294411eb932

1  2 
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcxproj
scilab/modules/xcos/Makefile.in

Simple merge
Simple merge