Merge remote branch 'origin/sas' into YaSp 23/623/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Mon, 17 May 2010 15:29:37 +0000 (17:29 +0200)
committerBruno JOFRET <bruno.jofret@scilab.org>
Mon, 17 May 2010 15:29:37 +0000 (17:29 +0200)
commitd446148cbe55bd95b1235e78483524c07b538753
tree4d47653ec47d187dfcbcaada5775f7ac4407fac3
parent6473ce1e6bd71e1cbd21b0a0e0408acb59dd1f03
parent200ccc0becff50f2b1844bb774d433938ea2f758
Merge remote branch 'origin/sas' into YaSp

Conflicts:
scilab/Scilab.sln
scilab/configure
scilab/modules/Makefile.in
scilab/modules/boolean/sci_gateway/c/sci_or.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/elementary_functions/sci_gateway/c/sci_isreal.c
scilab/modules/elementary_functions/sci_gateway/c/sci_number_properties.c
scilab/modules/elementary_functions/sci_gateway/c/sci_rand.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/sci_gateway/c/sci_testmatrix.c
scilab/modules/elementary_functions/sci_gateway/c/sci_tril.c
scilab/modules/elementary_functions/sci_gateway/c/sci_triu.c
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
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_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/functions/sci_gateway/c/sci_exec.c
scilab/modules/functions/sci_gateway/c/sci_execstr.c
scilab/modules/functions/sci_gateway/c/sci_lib.c
scilab/modules/functions/sci_gateway/c/sci_whereis.c
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
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/tests/unit_tests/inttype.tst
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/localization/includes/localization.h
scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/parameters/Makefile.in
scilab/modules/sound/sci_gateway/c/gw_sound.c
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/xpad/sci_gateway/cpp/sci_xpad.cpp

Change-Id: I2a746501e63caaa413dc680230ae444f71fd03e4
153 files changed:
scilab/.gitignore
scilab/Scilab.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.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.am
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.in
scilab/modules/console/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/gw_core.c
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/sci_gateway/c/sci_typename.c
scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/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/sci_atan.c
scilab/modules/elementary_functions/sci_gateway/c/sci_clean.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cumprod.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cumsum.c
scilab/modules/elementary_functions/sci_gateway/c/sci_diag.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dsearch.c
scilab/modules/elementary_functions/sci_gateway/c/sci_expm.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_kron.c
scilab/modules/elementary_functions/sci_gateway/c/sci_log.c
scilab/modules/elementary_functions/sci_gateway/c/sci_log1p.c
scilab/modules/elementary_functions/sci_gateway/c/sci_matrix.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/c/sci_nearfloat.c
scilab/modules/elementary_functions/sci_gateway/c/sci_number_properties.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sum.c
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
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_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/c/sci_exec.c
scilab/modules/functions/sci_gateway/c/sci_execstr.c
scilab/modules/functions/sci_gateway/c/sci_lib.c
scilab/modules/functions/src/c/getmacroslist.c
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
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/history_manager/Makefile.in
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/localization.h
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/mexlib/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
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/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xpad/Makefile.in