Merge remote branch 'origin/master' into YaSp 52/4052/2
authorBruno JOFRET <bruno.jofret@scilab.org>
Mon, 16 May 2011 13:19:33 +0000 (15:19 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Mon, 16 May 2011 15:28:11 +0000 (17:28 +0200)
commit395fba43172b83a8add3ab530d10aa50238f0dae
tree160e687bbc72bdda686908236b09014a5cd35ca2
parentaad1010a2f0f927cedae60321f84659b05a3ddb2
parenta047ac56fd59fa6f030bc05d90f22dc681f55ab8
Merge remote branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/etc/Info.plist
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/stack2.c
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/history_browser/Makefile.am
scilab/modules/integer/integer.iss
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/c/do_xxprintf.c
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/string/string.iss
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/registry.c

Change-Id: I7ec4eb216b0c505d157d09307a7e22c4f8d9d2e1
308 files changed:
scilab/Makefile.in
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.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/api_scilab.vcproj
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/arnoldi/arnoldi.vcproj
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/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/cacsd.iss
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.iss
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcproj
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/completion.c
scilab/modules/completion/src/c/completion.vcproj
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/getversion.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/stack-c.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/csignal.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/inisci.f
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/data_structures.iss
scilab/modules/data_structures/src/c/data_structures.vcproj
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/test_run.sci
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/differential_equations/src/c/differential_equations.vcproj
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/double.iss
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.iss
scilab/modules/fftw/fftw.vcproj
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/functions.iss
scilab/modules/functions/src/c/functions.vcproj
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/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.iss
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/graphics.vcproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/gui.iss
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/hdf5.iss
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/src/c/history_browser.vcproj
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/history_manager.iss
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/integer.iss
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/interpolation.iss
scilab/modules/interpolation/src/c/interpolation.vcproj
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/io/src/c/io.vcproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.iss
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/libjvm.vcproj
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/linear_algebra/sci_gateway/c/sci_chol.c
scilab/modules/linear_algebra/sci_gateway/c/sci_inv.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/localization.iss
scilab/modules/localization/src/localization.vcproj
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/matio.vcproj
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/optimization/src/c/optimization.vcproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/src/c/do_xxprintf.c
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/parameters.vcproj
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/polynomials.iss
scilab/modules/polynomials/src/c/polynomials.vcproj
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.iss
scilab/modules/pvm/pvm.vcproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/randlib.iss
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/renderer/renderer.vcproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/scicos.iss
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/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/scinotes.iss
scilab/modules/scinotes/src/c/scinotes.vcproj
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/shell.iss
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/shell.vcproj
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/sound/sound.vcproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/sparse.iss
scilab/modules/sparse/src/c/sparse.vcproj
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/spreadsheet/spreadsheet.vcproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/string/string.iss
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcproj
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/tclsci/tclsci.vcproj
scilab/modules/texmacs/Makefile.in
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/time.iss
scilab/modules/time/time.vcproj
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/ui_data/src/c/ui_data.vcproj
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/includes/gw_windows_tools.h
scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/registry.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/windows_tools/windows_tools.iss
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xcos/xcos.iss