Merge remote-tracking branch 'origin/master' into yasp 76/11176/3
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 29 Mar 2013 17:09:10 +0000 (18:09 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 2 Apr 2013 07:26:32 +0000 (09:26 +0200)
commit72fe1c2440f4579494c7f270943db9a11d7ba68a
tree4c5e981fb5f3159f151ef5ec95a4b7159b4ce543
parentedccdaf321f45df19fab6e472170bd093a2ac367
parent26b1beb9f8275030be207d110d9ffeb6c2bae8ff
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/tests/unit_tests/varargout.dia.ref
scilab/modules/core/tests/unit_tests/varargout.tst
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/includes/gw_differential_equations2.h
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c
scilab/modules/differential_equations/sci_gateway/differential_equations_gateway.xml
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_bvode.f
scilab/modules/differential_equations/src/c/DllmainDifferential_equations.c
scilab/modules/differential_equations/src/c/dassltable.c
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/c/differential_equations_f_Import.def
scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj.filters
scilab/modules/fftw/sci_gateway/c/sci_get_fftw_wisdom.c
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_getURLcontent.c
scilab/modules/fileio/src/c/dlManager.h
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/io/src/c/setenvc.c
scilab/modules/io/src/fortran/newsave.f
scilab/modules/linear_algebra/sci_gateway/c/sci_qr.c
scilab/modules/output_stream/tests/unit_tests/msprintf.tst
scilab/modules/signal_processing/tests/unit_tests/corr.dia.ref
scilab/modules/signal_processing/tests/unit_tests/corr.tst
scilab/modules/signal_processing/tests/unit_tests/rpem.dia.ref
scilab/modules/signal_processing/tests/unit_tests/rpem.tst
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_code2str.c
scilab/modules/string/sci_gateway/c/sci_str2code.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/src/c/strsplit.h
scilab/tools/innosetup/components.iss

Change-Id: Id2d0cc07fbe710a1d43abe472ab6df6d01716c8b
57 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/tests/unit_tests/varargout.dia.ref
scilab/modules/core/tests/unit_tests/varargout.tst
scilab/modules/differential_equations/includes/gw_differential_equations2.h
scilab/modules/differential_equations/sci_gateway/c/gw_differential_equations2.c
scilab/modules/differential_equations/src/c/DllmainDifferential_equations.c
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj.filters
scilab/modules/differential_equations/src/c/differential_equations_f_Import.def
scilab/modules/differential_equations/src/fortran/differential_equations_Import.def
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj.filters
scilab/modules/differential_equations/tests/unit_tests/ode.tst
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/fftw/sci_gateway/c/sci_get_fftw_wisdom.c
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/dlManager.h
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_getURL.c
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj.filters
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/io/src/c/getenvc.c
scilab/modules/io/src/c/setenvc.c
scilab/modules/linear_algebra/sci_gateway/c/sci_qr.c
scilab/modules/renderer/renderer.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/c/strsplit.h
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/xml/sci_gateway/cpp/sci_xmlAppend.cpp
scilab/tools/innosetup/base.iss
scilab/tools/innosetup/components.iss