Merge remote-tracking branch 'origin/master' into vs2012 42/12242/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 8 Aug 2013 09:25:15 +0000 (11:25 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 8 Aug 2013 09:25:58 +0000 (11:25 +0200)
commitd711f6707935fe0dd02b0ebbf7f3abeb9ddc178d
tree535b58d6f74d9e86f37df584fe9cf14e6c14f57f
parente0a4e790c21c9b09839937c2bf835d35b9a9902a
parentd25fba5ecbef4874cdf47f699f1aea1c0e8c2a12
Merge remote-tracking branch 'origin/master' into vs2012

Change-Id: I531efcd7c4b0818b00d891f6430f5afe3b91a652
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/dynamic_link/macros/detectmsvc64tools.sci
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj