Merge remote branch 'origin/master' into YaSp 86/2786/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Thu, 16 Dec 2010 13:56:20 +0000 (14:56 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Thu, 16 Dec 2010 13:56:20 +0000 (14:56 +0100)
commit4d3710e2962032e9bdb9423dff3629a71a4e7982
tree480cd06a041276ad283e07c4e428d474316aba40
parent8bbf1e5e3b8109cbdc18bbc15150d6acfcd91a50
parent6c62ba2ba5adf88a2fafd67c620341fc2e4a2076
Merge remote branch 'origin/master' into YaSp

Conflicts:
scilab/CHANGES
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/core/sci_gateway/c/sci_getmodules.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fileio/sci_gateway/c/sci_mscanf.c
scilab/modules/functions/src/c/libraryinfo.c
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/localization.vcproj
scilab/modules/output_stream/src/c/errmsg.c
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/scicos/locales/en_US/scicos.pot
scilab/modules/scicos/locales/es_ES/scicos.po
scilab/modules/scicos/locales/ja_JP/scicos.po
scilab/modules/scicos/locales/ru_RU/scicos.po
scilab/modules/string/sci_gateway/c/sci_emptystr.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java

Change-Id: I783f88d10d983823fab6684f994c40dda4c29956
126 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/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.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/arnoldi/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/sci_gateway/c/sci_newfun.c
scilab/modules/core/src/c/parse.c
scilab/modules/core/src/c/run.c
scilab/modules/core/src/cpp/hashtable_core.cpp
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/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/sci_gateway/c/sci_mscanf.c
scilab/modules/fileio/src/c/fscanfMat.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/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/includes/gw_helptools.h
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
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.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.iss
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/localization.vcproj
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/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/output_stream/src/c/errmsg.c
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/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/locales/de_DE/scicos.po
scilab/modules/scicos/locales/pt_BR/scicos.po
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/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.am
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/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/windows_tools/src/c/scilab_windows/spawncommand.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/tools/innosetup/base.iss