Merge commit 'origin/master' into sas
authorBruno JOFRET <bruno.jofret@scilab.org>
Tue, 15 Sep 2009 11:41:58 +0000 (13:41 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Tue, 15 Sep 2009 11:41:58 +0000 (13:41 +0200)
commit78259214f873fd730fcf16261c9ce753bf818fa4
treee14d9766d5e2e23f915f5561b1aab073cb0d9ff1
parent45e8bbe115b6f0db569154583e7d08c3380dd1e6
parent993c6205db165f946976b4b1ba232fdb5806180f
Merge commit 'origin/master' into sas

Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/config/ltmain.sh
scilab/configure
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/m4/libtool.m4
scilab/m4/ltoptions.m4
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
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/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
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.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/metanet/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/msgs.h
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/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/scipad/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
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/statistics/includes/gw_statistics.h
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
65 files changed:
scilab/Scilab.sln
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/action_binding/Makefile.am
scilab/modules/arnoldi/Makefile.am
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/cacsd/Makefile.am
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/completion/Makefile.am
scilab/modules/core/Makefile.am
scilab/modules/core/includes/stack-c.h
scilab/modules/core/includes/stack1.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack3.c
scilab/modules/differential_equations/Makefile.am
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/includes/AddFunctionInTable.h
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
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/fileio/Makefile.am
scilab/modules/functions/Makefile.am
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphics/Makefile.am
scilab/modules/gui/Makefile.am
scilab/modules/helptools/Makefile.am
scilab/modules/history_manager/Makefile.am
scilab/modules/integer/Makefile.am
scilab/modules/interpolation/Makefile.am
scilab/modules/io/Makefile.am
scilab/modules/jvm/Makefile.am
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/localization/Makefile.am
scilab/modules/matio/Makefile.am
scilab/modules/metanet/Makefile.am
scilab/modules/optimization/Makefile.am
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/includes/msgs.h
scilab/modules/polynomials/Makefile.am
scilab/modules/pvm/Makefile.am
scilab/modules/randlib/Makefile.am
scilab/modules/shell/Makefile.am
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/includes/ipmpar1.h
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/string/Makefile.am
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbolic/Makefile.am
scilab/modules/tclsci/Makefile.am
scilab/modules/time/time.vcproj
scilab/modules/umfpack/Makefile.am