Merge remote-tracking branch 'origin/master' into YaSp 94/8694/4
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 14 Aug 2012 07:57:35 +0000 (09:57 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 14 Aug 2012 09:31:15 +0000 (11:31 +0200)
commitb4ab6cfc0aa1fdef72a9cbaa136daa5a7984215f
tree75b6b64d1eb72ff5a3c346f5a3bd4ec73eb3cc75
parent13646f0787dd466364c1612b4087c356bd3b6210
parentaeed818c5c7387f63b4bd70d68d398e637778c84
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/machine.h.in
scilab/modules/double/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
scilab/modules/hdf5/src/cpp/forceJHDF5load.cpp
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java
scilab/modules/hdf5/src/jni/jhdf5load.hxx
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/help/en_US/intersci.xml
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/modules_manager/help/en_US/tbx_build_loader.xml
scilab/modules/types/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp

Change-Id: I47b159cfa8f15e9f1594a3de2693aaf9c75ed7e0
116 files changed:
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
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/core/includes/machine.h.in
scilab/modules/core/macros/toolboxes.sci
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
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/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
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/src/c/getHandleProperty/set_line_style_property.c
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/hdf5.iss
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.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/hdf5_gateway.xml
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
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/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_save.c
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/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/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/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/src/jni/Palette.hxx
scilab/modules/xml/Makefile.in
scilab/scilab-lib.properties.in