Merge remote-tracking branch 'origin/5.5' 16/14416/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 14 Apr 2014 15:29:36 +0000 (17:29 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 14 Apr 2014 15:29:42 +0000 (17:29 +0200)
commit48b40a2a0a9d416a37e1c712abe886150b268796
tree2d34dd877a4af391ebfd799bdc32d50a209243f5
parent1e54699adcaa3e5cbb9d8c3205458a8cd4bf03c7
parent5f2c5ca24c0f9535a2f8e19822282ad291b236cf
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/configure
scilab/configure.ac
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/modules/action_binding/src/c/action_binding.rc
scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
scilab/modules/api_scilab/src/c/api_scilab.rc
scilab/modules/arnoldi/src/c/arnoldi.rc
scilab/modules/boolean/src/c/boolean.rc
scilab/modules/boolean/src/fortran/boolean_f.rc
scilab/modules/cacsd/src/c/cacsd.rc
scilab/modules/cacsd/src/fortran/cacsd_f.rc
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc
scilab/modules/call_scilab/src/c/call_scilab.rc
scilab/modules/commons/src/c/commons.rc
scilab/modules/commons/src/fortran/commons_f.rc
scilab/modules/completion/src/c/completion.rc
scilab/modules/completion/src/nocompletion/nocompletion.rc
scilab/modules/console/src/c/console.rc
scilab/modules/console/src/noconsole/noconsole.rc
scilab/modules/core/includes/version.h.vc
scilab/modules/data_structures/src/c/data_structures.rc
scilab/modules/data_structures/src/fortran/data_structures_f.rc
scilab/modules/differential_equations/src/c/differential_equations.rc
scilab/modules/differential_equations/src/fortran/differential_equations_f.rc
scilab/modules/double/src/c/double.rc
scilab/modules/double/src/fortran/double_f.rc
scilab/modules/dynamic_link/src/c/dynamic_link.rc
scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc
scilab/modules/elementary_functions/src/c/elementary_functions.rc
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc
scilab/modules/external_objects/external_objects.rc
scilab/modules/external_objects_java/external_objects_java.rc
scilab/modules/fftw/src/c/fftw.rc
scilab/modules/fftw/src/nofftw/nofftw.rc
scilab/modules/fileio/src/c/fileio.rc
scilab/modules/functions/src/c/functions.rc
scilab/modules/functions/src/fortran/functions_f.rc
scilab/modules/graphic_export/graphic_export.rc
scilab/modules/graphic_export/src/nographic_export/nographic_export.rc
scilab/modules/graphics/graphic.rc
scilab/modules/graphics/src/nographics/nographics.rc
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/src/c/gui.rc
scilab/modules/gui/src/nogui/nogui.rc
scilab/modules/hdf5/src/c/hdf5.rc
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/data/pages/homepage-ru_RU.html
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/helptools/src/c/helptools.rc
scilab/modules/history_browser/src/c/history_browser.rc
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_manager/src/c/history_manager.rc
scilab/modules/integer/src/c/integer.rc
scilab/modules/integer/src/fortran/integer_f.rc
scilab/modules/interpolation/src/c/interpolation.rc
scilab/modules/interpolation/src/fortran/interpolation_f.rc
scilab/modules/intersci/src/lib/intersci.rc
scilab/modules/io/src/c/io.rc
scilab/modules/io/src/fortran/io_f.rc
scilab/modules/javasci/javasci.rc
scilab/modules/jvm/src/c/libjvm.rc
scilab/modules/jvm/src/nojvm/nojvm.rc
scilab/modules/linear_algebra/src/c/linear_algebra.rc
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc
scilab/modules/localization/src/localization.rc
scilab/modules/matio/src/c/matio.rc
scilab/modules/matio/src/nomatio/nomatio.rc
scilab/modules/mexlib/src/libmat/libmat.rc
scilab/modules/mexlib/src/libmex/libmex.rc
scilab/modules/mexlib/src/libmx/libmx.rc
scilab/modules/mpi/src/c/mpi.rc
scilab/modules/optimization/src/c/optimization.rc
scilab/modules/optimization/src/fortran/optimization_f.rc
scilab/modules/output_stream/src/c/output_stream.rc
scilab/modules/output_stream/src/fortran/output_stream_f.rc
scilab/modules/parallel/src/c/parallel.rc
scilab/modules/parameters/src/c/parameters.rc
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/polynomials/src/fortran/polynomials_f.rc
scilab/modules/preferences/src/c/preferences.rc
scilab/modules/randlib/src/c/randlib.rc
scilab/modules/randlib/src/fortran/randlib_f.rc
scilab/modules/randlib/src/norandlib/norandlib.rc
scilab/modules/renderer/renderer.rc
scilab/modules/renderer/src/norenderer/norenderer.rc
scilab/modules/scicos/src/c/cli/scicos-cli.rc
scilab/modules/scicos/src/c/noscicos/noscicos.rc
scilab/modules/scicos/src/c/scicos.rc
scilab/modules/scicos/src/fortran/scicos_f.rc
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.rc
scilab/modules/scicos_blocks/src/c/scicos_blocks.rc
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc
scilab/modules/scinotes/src/c/scinotes.rc
scilab/modules/signal_processing/src/c/signal_processing.rc
scilab/modules/signal_processing/src/fortran/signal_processing_f.rc
scilab/modules/sound/src/c/sound.rc
scilab/modules/sound/src/nosound/nosound.rc
scilab/modules/sparse/src/c/sparse.rc
scilab/modules/sparse/src/fortran/sparse_f.rc
scilab/modules/special_functions/src/c/special_functions.rc
scilab/modules/special_functions/src/fortran/special_functions_f.rc
scilab/modules/spreadsheet/src/c/spreadsheet.rc
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
scilab/modules/statistics/src/c/statistics.rc
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/src/c/string.rc
scilab/modules/string/src/fortran/string_f.rc
scilab/modules/symbolic/src/c/symbolic.rc
scilab/modules/symbolic/src/fortran/symbolic_f.rc
scilab/modules/tclsci/src/c/tclsci.rc
scilab/modules/time/src/c/time.rc
scilab/modules/ui_data/src/c/ui_data.rc
scilab/modules/ui_data/src/noui_data/noui_data.rc
scilab/modules/umfpack/src/c/umfpack.rc
scilab/modules/umfpack/src/noumfpack/noumfpack.rc
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
scilab/modules/windows_tools/src/c/windows_tools.rc
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
scilab/modules/xcos/src/c/xcos.rc
scilab/modules/xml/src/c/xml.rc

Change-Id: Ia405ecabcf2f03948ead5e313c9a44137eb211ab