Merge commit 'origin/master' into sas
authorAntoine ELIAS <antoine.elias@scilab.org>
Mon, 4 Jan 2010 08:59:03 +0000 (09:59 +0100)
committerAntoine ELIAS <antoine.elias@scilab.org>
Mon, 4 Jan 2010 08:59:03 +0000 (09:59 +0100)
commit3a615b3ef9671812430e33632c58d47c53cc3773
treefd2bd62c70fe2d28ff5725a69c2a0d2817cf5056
parent2683055a1b244fb1a9235ee0df43eec08fed891e
parent3ad34dc5ae622436849ca5d04c9be05d32053333
Merge commit 'origin/master' into sas

Conflicts:
scilab/Scilab.sln
scilab/configure
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/javasci/Javasci.vcproj
scilab/modules/localization/Makefile.in
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
133 files changed:
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/LibScilab_Import.def
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.vcproj
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/stack1.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack3.c
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/Javasci.vcproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/linear_algebra/tests/unit_tests/svd.tst
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/time.vcproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in