Merge remote-tracking branch 'origin/master' into YaSp 33/15733/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 5 Jan 2015 09:40:38 +0000 (10:40 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 5 Jan 2015 10:18:25 +0000 (11:18 +0100)
commit612bb39a0fc7f832467c7f265ff2c157a517a7ee
tree3b6f1154f3d8f2700678ac5fe9e1ff0864b84105
parentf05478391192082d64810851251e068aa4e85052
parent6483980defac581112e60be9a3e69830ecaca0a4
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/linear_algebra/tests/nonreg_tests/bug_545.tst
scilab/modules/sparse/tests/nonreg_tests/bug_3310.dia.ref
scilab/modules/sparse/tests/nonreg_tests/bug_3310.tst

Change-Id: Ie02c79d0ea2403032ff885e79b43c33cc266f8f9
14 files changed:
scilab/etc/scilab.start
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/dynamic_link/macros/windows/dlwCompile.sci
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/sci_log10.c
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw.cpp
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj.filters
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters