Merge remote-tracking branch 'origin/master' into yasp 65/11265/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 12 Apr 2013 08:45:34 +0000 (10:45 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 12 Apr 2013 09:04:33 +0000 (11:04 +0200)
commit78d1ca34fa6a647ce3b4c67584b7e2d2c18c4ce0
tree0915ee46e7ac0b4db017976c065e980457b19f90
parent5cc0cb644b5638926d7de87026b716a0d80a2e6e
parent13827b2ab3647736ee0b7bb92f0bdf9a1d79d821
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/configure
scilab/modules/api_scilab/src/cpp/api_error.cpp
scilab/modules/double/Makefile.in
scilab/modules/functions/macros/genlib.sci
scilab/modules/hdf5/includes/gw_hdf5.h
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/intersci/Makefile.in
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc

Change-Id: I0b059265c3ec20db17d6a7af994895879516db3b
144 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/src/cpp/api_error.cpp
scilab/modules/arnoldi/Makefile.in
scilab/modules/ast/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/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/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/sci_gateway/c/sci_getURL.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/functions/Makefile.in
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/sci_gateway/c/sci_unzoom.c
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/includes/gw_hdf5.h
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
scilab/modules/hdf5/sci_gateway/cpp/sci_h5attr.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5close.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5cp.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5dataset.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5dump.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5exists.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5flush.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5get.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5group.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5isfoo.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5label.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5ln.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5ls.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5mount.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5mv.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5open.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5read.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5readattr.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5rm.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5umount.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5write.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_percent_H5Object_e.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_percent_H5Object_fieldnames.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_percent_H5Object_p.cpp
scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml
scilab/modules/hdf5/src/c/core_Import.def
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/cpp/H5BasicData.hxx
scilab/modules/hdf5/src/cpp/H5BitfieldData.hxx
scilab/modules/hdf5/src/cpp/H5CompoundData.cpp
scilab/modules/hdf5/src/cpp/H5NamedObjectsList.hxx
scilab/modules/hdf5/src/cpp/H5Type.hxx
scilab/modules/hdf5/src/cpp/h5create.hpp
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/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/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/threads/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/src/c/taucs_scilab.c
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_Xcos.cpp
scilab/modules/xml/Makefile.in
scilab/test/good/fieldnames.sci