Merge remote branch 'origin/master' into YaSp 11/3611/2
authorBruno JOFRET <bruno.jofret@scilab.org>
Wed, 23 Mar 2011 13:43:14 +0000 (14:43 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Wed, 23 Mar 2011 14:28:11 +0000 (15:28 +0100)
commitb87e6db71f0f0e54ec50148848f31321f84d33da
treeab8fcd5d09662665183a69dc4032839c4dbb13c0
parent4cf75114220d0fad90678844d9c640c50d1d2135
parente037015d45aee12d3720602e84d2b49ef6f22db9
Merge remote branch 'origin/master' into YaSp

Conflicts:
scilab/modules/action_binding/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/src/cpp/ConsoleRead.cpp
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/version.h.vc
scilab/modules/core/sci_gateway/fortran/sci_f_exists.f
scilab/modules/core/src/fortran/core_f.vfproj
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/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/macros/mkdir.sci
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/etc/SciDocConf.xml
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/src/c/javasci_SciAbstractArray.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/matio/Makefile.am
scilab/modules/matio/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/parallel/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/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/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_amell.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_corr.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_delip.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_fft.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_fiir.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_remez.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_rpem.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_syredi.f
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.am

Change-Id: Ib995d09c2cbece3fb3bc1ce169c8ee1d0df6dd5d
119 files changed:
scilab/bin/scilab
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
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/commons/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/src/cpp/ConsoleRead.cpp
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/graph/Makefile.in
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/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
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/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/src/c/javasci_SciAbstractArray.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
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/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
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/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/src/c/InitTclTk.c
scilab/modules/tclsci/src/c/TCL_Command.c
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in