Merge remote-tracking branch 'origin/5.4' 50/10650/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 1 Mar 2013 09:10:43 +0000 (10:10 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 1 Mar 2013 09:18:49 +0000 (10:18 +0100)
commit0d9b9a01e59f7f20fc81e0c98ae0064e77d25c45
tree943ec1246649fd8267b3ad8957694db73bd8ebdd
parenta7f3e43564bbd757df7da67092568567958e8a4d
parent75ac069d82ccf8f4d1d516d18a47b7525085d6d1
Merge remote-tracking branch 'origin/5.4'

Conflicts:
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/Makefile.in
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/Makefile.in
scilab/libs/libst/libst.rc
scilab/modules/api_scilab/core_Import.def
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/graphics/core_Import.def
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcxproj

Change-Id: I9f12787dd99bb74bfe89f633c2c7a1aecf5b1bb1
87 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/libs/.gitignore
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/core_Import.def
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/external_objects/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/functions/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.in