Merge remote-tracking branch 'origin/master' into yasp 64/10064/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 19 Dec 2012 16:24:56 +0000 (17:24 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 19 Dec 2012 17:07:33 +0000 (18:07 +0100)
commit02d32047f1161c83138c3da5da1681a0060b86ea
tree4e5af0fd2c779caf66cb0903ee1b36694d6c494e
parent44b3423a96a9d2dd476ae228aba1c889cf0defc5
parentf05b88b21dba8e42fbb60f54cfff80f4103b6d26
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/core_Import.def
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/sci_gateway/c/gw_cacsd1.c
scilab/modules/cacsd/sci_gateway/c/gw_slicot.c
scilab/modules/cacsd/sci_gateway/cacsd_gateway.xml
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/getval.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/fileio/tests/unit_tests/meof.dia.ref
scilab/modules/functions/functions.iss
scilab/modules/io/io.iss
scilab/modules/scicos/Makefile.in
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c

Change-Id: Ia51f71b36871a257323d58087516c13370f9aca3
61 files changed:
scilab/bin/scilab
scilab/contrib/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/api_scilab/elementary_functions_Import.def
scilab/modules/api_scilab/includes/api_double.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_internal_double.h
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/arnoldi/sci_gateway/c/sci_eigs.c
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/includes/gw_slicot.h
scilab/modules/cacsd/sci_gateway/c/gw_cacsd1.c
scilab/modules/cacsd/sci_gateway/c/gw_slicot.c
scilab/modules/cacsd/sci_gateway/c/sci_dhinf.c
scilab/modules/cacsd/sci_gateway/c/sci_hinf.c
scilab/modules/cacsd/sci_gateway/c/sci_linmeq.c
scilab/modules/cacsd/sci_gateway/c/sci_mucomp.c
scilab/modules/cacsd/sci_gateway/c/sci_rankqr.c
scilab/modules/cacsd/sci_gateway/c/sci_rankqr.h
scilab/modules/cacsd/sci_gateway/c/sci_ricc2.c
scilab/modules/cacsd/sci_gateway/c/sci_rrankqr.c
scilab/modules/cacsd/sci_gateway/c/sci_zrankqr.c
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/c/cacsd.vcxproj.filters
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/stack2.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/getval.c
scilab/modules/core/src/c/getval.h
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/sci_tools.h
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/fileio/tests/unit_tests/meof.dia.ref
scilab/modules/fileio/tests/unit_tests/meof.tst
scilab/modules/functions/functions.iss
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/io/io.iss
scilab/modules/polynomials/sci_gateway/fortran/sci_f_poly.f
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateAllIcons.cpp
scilab/modules/xcos/src/c/xcos.vcxproj