Merge remote-tracking branch 'origin/master' into YaSp 45/15545/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 18 Nov 2014 13:56:42 +0000 (14:56 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 18 Nov 2014 13:56:50 +0000 (14:56 +0100)
commit4d6fbb947e5d910199b9bd6de6c756ef9c22cf91
treef29f8c59dec55843be654ed2e2b697de569125f2
parent608b60c99da91646c235895dcfdf2e5d56418d25
parent51f13b7c19d10c455c6187c38ba421d95ad3eee4
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/mpi/macros/MPIPi.sci
scilab/tools/innosetup/files.iss

Change-Id: Ia11a00d1b615b9f6fafb3c7cb66bd7c1a5a3acde
scilab/Scilab.sln
scilab/modules/core/includes/callinterf.h
scilab/modules/mpi/mpi.vcxproj
scilab/modules/mpi/sci_gateway/c/gw_mpi.c
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss