Merge remote-tracking branch 'origin/master' into uicontrol 42/18042/1
Antoine ELIAS [Tue, 5 Apr 2016 12:53:14 +0000 (14:53 +0200)]
Change-Id: I1c63df2e8f55dec669ea653718c6112be3c916cd

1  2 
scilab/bin/scilab
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/startup/src/cpp/scilab.cpp

Simple merge
Simple merge
Simple merge