Merge remote-tracking branch 'origin/master' into yasp 24/12024/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 12 Jul 2013 14:00:09 +0000 (16:00 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 12 Jul 2013 15:01:53 +0000 (17:01 +0200)
commitbbbd09748f1e8d97318fbe82bcc60678b215a4fc
treee561de3d7c89fd0887c7aa1f9481d0d09cf7de1b
parentb8561b79b83e59c96f517c3e7e449f40ce7a2f1c
parent0c5f3f22ca9d2dddb03cffacd40637922f14591b
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/etc/scilab.start
scilab/modules/completion/tests/nonreg_tests/bug_3051.tst
scilab/modules/console/src/c/cmdLine/cliPrompt.c
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/sci_gateway/fortran/sci_f_exists.f
scilab/modules/core/src/c/expr.c
scilab/modules/core/src/c/getval.c
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack2.c
scilab/modules/data_structures/src/c/hmops.c
scilab/modules/differential_equations/tests/unit_tests/dae.dia.ref
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/sci_gateway/c/gw_double.c
scilab/modules/double/sci_gateway/fortran/matsubt.f
scilab/modules/double/src/c/double_f_Import.def
scilab/modules/double/src/fortran/double_f.vfproj
scilab/modules/double/src/fortran/double_f2c.vcxproj
scilab/modules/double/src/fortran/double_f2c.vcxproj.filters
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_number_properties.f
scilab/modules/fftw/src/c/fftw_utilities.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/functions/macros/genlib.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/integer/src/fortran/i_s_i.f
scilab/modules/integer/src/fortran/i_t.f
scilab/modules/integer/src/fortran/intops.f
scilab/modules/io/src/fortran/newsave.f
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/output_stream/src/c/set_xxprintf.c
scilab/modules/output_stream/src/fortran/print.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_delip.f
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/src/c/stringToComplex.c

Change-Id: I19407c3261db8aa092e699a3707f74e5f4d126d4
37 files changed:
scilab/bin/scilab
scilab/modules/cacsd/sci_gateway/c/sci_linmeq.c
scilab/modules/console/src/c/cmdLine/cliPrompt.c
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/src/c/texmacs.c
scilab/modules/data_structures/includes/gw_data_structures1.h
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/data_structures/src/c/core_Import.def
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/graphics/sci_gateway/c/sci_is_handle_valid.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/interpolation/sci_gateway/c/sci_splin2d.c
scilab/modules/optimization/sci_gateway/c/sci_qld.c
scilab/modules/overloading/macros/generic_i_h.sci
scilab/modules/polynomials/src/fortran/dpsimp.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/sparse/tests/unit_tests/sparse.dia.ref
scilab/modules/sparse/tests/unit_tests/sparse.tst
scilab/modules/special_functions/sci_gateway/c/sci_legendre.c
scilab/modules/string/src/c/pcre_private.c
scilab/modules/string/src/c/stringToComplex.c
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/umfpack/sci_gateway/c/gw_umfpack.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chget.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chsolve.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luget.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lusolve.c
scilab/modules/umfpack/src/c/common_umfpack.c