Merge remote-tracking branch 'origin/master' into YaSp 41/10541/3
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 19 Feb 2013 15:18:41 +0000 (16:18 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 19 Feb 2013 17:02:24 +0000 (18:02 +0100)
commit157cf09d548caea10161fc1a563ed929f453b3d6
treed7a5c5990753f370d630ca38ef9b7d22359659c6
parentf9f819f6b5af11402a2d9e8b9f8f260a5e1b8d3c
parent12f44ae6250e895bf77b2503fd24dde03b845a6c
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.in
scilab/configure
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/completion/src/c/completion.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/c/stack2.c
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/IsEqualVar.c
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects/src/cpp/deff.cpp
scilab/modules/fftw/sci_gateway/c/sci_dst.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/src/c/fscanfMat.h
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/src/c/getenvc.c
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/includes/gw_special_functions.h
scilab/modules/special_functions/sci_gateway/c/gw_special_functions.c
scilab/modules/special_functions/sci_gateway/c/sci_calerf.c
scilab/modules/special_functions/sci_gateway/special_functions_gateway.xml
scilab/modules/special_functions/src/c/special_functions.vcxproj

Change-Id: I611009921ecfdf7c8a0982d63a531edc6b9bb979
89 files changed:
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/completion/src/c/completion.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/machine.h.in
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj.filters
scilab/modules/external_objects/sci_gateway/cpp/sci_doubleExclam_invoke_.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_invoke_lu.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EClass_e.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_0.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_1_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_2_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_3_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_4_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_5.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_a_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_d_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_disp.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_e.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_g_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_h_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_j_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_k_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_l_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_m_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_n_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_o_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_p.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_p_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_q_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_r_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_s_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_t.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_x_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_y_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_EObj_z_foo.cpp
scilab/modules/external_objects/sci_gateway/cpp/sci_percent_foo_i_EObj.cpp
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/fftw/sci_gateway/c/sci_dst.c
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/fscanfMat.h
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/src/c/getenvc.c
scilab/modules/jvm/src/c/createMainScilabObject.c
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/includes/gw_special_functions.h
scilab/modules/special_functions/sci_gateway/c/sci_besselh.c
scilab/modules/special_functions/sci_gateway/c/sci_besseli.c
scilab/modules/special_functions/sci_gateway/c/sci_besselj.c
scilab/modules/special_functions/sci_gateway/c/sci_besselk.c
scilab/modules/special_functions/sci_gateway/c/sci_bessely.c
scilab/modules/special_functions/sci_gateway/cpp/sci_faddeeva.hxx
scilab/modules/special_functions/sci_gateway/special_functions_gateway.xml
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj.filters
scilab/modules/special_functions/src/cpp/faddeeva.h
scilab/modules/special_functions/tests/unit_tests/calerf.dia.ref
scilab/modules/special_functions/tests/unit_tests/calerf.tst
scilab/tools/innosetup/code.iss