Merge remote branch 'origin/sas' into YaSp
authorantoine ELIAS <antoine.elias@scilab.org>
Tue, 16 Feb 2010 09:22:16 +0000 (10:22 +0100)
committerantoine ELIAS <antoine.elias@scilab.org>
Tue, 16 Feb 2010 09:22:16 +0000 (10:22 +0100)
commit5781441914904bcba2785af55dbbe414eaec2eed
tree1ba11e5bb5290ebd43bc05f916c004119fbbe53e
parent23b5efc9dc5fce7364afcfe3e2c18b198a92720e
parentde507ebc8dc73e0623d074f56feb9b5555718e54
Merge remote branch 'origin/sas' into YaSp

Conflicts:
scilab/configure
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/functions/includes/gw_functions.h
scilab/modules/functions/sci_gateway/c/gw_functions.c
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/string/includes/gw_string.h
89 files changed:
scilab/.gitignore
scilab/Makefile.in
scilab/aclocal.m4
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/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
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.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/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/c/gw_functions.c
scilab/modules/functions/sci_gateway/c/sci_lib.c
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
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.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/javasci/Makefile.in
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/mexlib/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parameters/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/sparse/Makefile.in
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/sparse/sci_gateway/c/gw_sparse.c
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp
scilab/modules/xpad/Makefile.in