Merge remote branch 'origin/master' into YaSp 13/3513/2
authorBruno JOFRET <bruno.jofret@scilab.org>
Fri, 11 Mar 2011 14:15:57 +0000 (15:15 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Fri, 11 Mar 2011 15:29:05 +0000 (16:29 +0100)
commitfe61e4e65bb59303803695b2bab0540e58be01a8
treedfde56bab86345baa5e4c49db8787d65b6e1b3ca
parent53f041a0acc449227fa93bc25681899cc424cb44
parent0dac7970863383a21d4c261dbc9aa4566e7e53a1
Merge remote branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/libs/LibScilab/LibScilab.vcproj
scilab/modules/Makefile.am
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/boolean/Makefile.in
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/src/c/SCIHOME.c
scilab/modules/core/src/c/banier.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/double/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/macros/dec2oct.sci
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/macros/mkdir.sci
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_mclose.c
scilab/modules/fileio/sci_gateway/c/sci_mget.c
scilab/modules/fileio/sci_gateway/c/sci_mput.c
scilab/modules/fileio/sci_gateway/c/sci_mputl.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/functions/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/integer/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetStructVariable.c
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/sci_gateway/c/sci_mprintf.c
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/c/api_scilab_Import.def
scilab/modules/output_stream/src/c/errmsg.c
scilab/modules/pvm/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/special_functions/sci_gateway/c/sci_oldbesseli.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselj.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselk.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbessely.c
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_grep.c
scilab/modules/string/src/c/pcre_private.h
scilab/modules/string/src/c/stringsstrrchr.c
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/time/time.iss
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/readme.txt
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c

Change-Id: I3cee06ffb6dc0d72174b7d7c0595bc37d483056e
306 files changed:
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcproj
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/Info.plist
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/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/action_binding.iss
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_error.h
scilab/modules/api_scilab/includes/api_list.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/atoms.iss
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/boolean.iss
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/cacsd.iss
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.iss
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/completion.iss
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/console.iss
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/version.h
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/c/stack3.c
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/data_structures.iss
scilab/modules/demo_tools/Makefile.in
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/development_tools.iss
scilab/modules/development_tools/macros/buildmacros.sce
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/double.iss
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.iss
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/macros/mkdir.sci
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_merror.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/functions.iss
scilab/modules/functions/sci_gateway/c/sci_exec.c
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/genetic_algorithms/genetic_algorithms.iss
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.iss
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/gui.iss
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/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/etc/SciDocConf.xml
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/history_manager.iss
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/integer.iss
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/interpolation.iss
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/intersci.iss
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/io.iss
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.iss
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/localization.iss
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/m2sci/Makefile.in
scilab/modules/m2sci/m2sci.iss
scilab/modules/maple2scilab/Makefile.in
scilab/modules/maple2scilab/maple2scilab.iss
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.iss
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetStructVariable.c
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/mexlib.iss
scilab/modules/modules_manager/Makefile.in
scilab/modules/modules_manager/modules_manager.iss
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/optimization.iss
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/overloading/overloading.iss
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/parallel.iss
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.iss
scilab/modules/parameters/src/c/parameters.c
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/polynomials.iss
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.iss
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/randlib.iss
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/locales/ca_ES.po
scilab/modules/scicos/locales/de_DE.po
scilab/modules/scicos/locales/pt_BR.po
scilab/modules/scicos/locales/uk_UA.po
scilab/modules/scicos/locales/zh_CN.po
scilab/modules/scicos/locales/zh_TW.po
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/ezxml.c
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/scinotes.iss
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/shell.iss
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/simulated_annealing/simulated_annealing.iss
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sound.iss
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/sparse.iss
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/special_functions.iss
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/src/c/pcre_private.h
scilab/modules/string/src/c/string.vcproj
scilab/modules/string/src/c/stringsstrrchr.c
scilab/modules/string/src/c/strsubst.c
scilab/modules/string/string.iss
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/symbolic.iss
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/tclsci.iss
scilab/modules/texmacs/Makefile.in
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/types.iss
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/umfpack.iss
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c
scilab/modules/windows_tools/src/c/FindFileAssociation.c
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c
scilab/modules/windows_tools/windows_tools.iss
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_Xcos.cpp
scilab/modules/xcos/xcos.iss
scilab/tools/innosetup/code.iss