projects / scilab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4888adc eca0e95) | patch
Merge remote branch 'origin/5.2' into MPI
authorSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 18 Jan 2010 21:01:54 +0000 (22:01 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab.org>
Mon, 18 Jan 2010 21:01:54 +0000 (22:01 +0100)
commitce03e4196a20d00655d960ee7aafb1a56f452231
tree8ee8d7e49d4fb7e9e97c71cc2ec9c537c8b6fc5etree | snapshot
parent4888adcac97cc292839152c35f3676918e0cd515commit | diff
parenteca0e95cd3dd0791e6ae47e34118b123323780d7commit | diff
Merge remote branch 'origin/5.2' into MPI

Conflicts:
scilab/Version.incl
scilab/configure
scilab/etc/modules.xml.in
scilab/modules/api_scilab/help/en_US/string_reading_api.xml
scilab/modules/core/includes/version.h
83 files changed:
scilab/Makefile.in diff1 | diff2 | blob | history
scilab/aclocal.m4 diff1 | diff2 | blob | history
scilab/configure diff1 | diff2 | blob | history
scilab/configure.ac diff1 | diff2 | blob | history
scilab/contrib/Makefile.in diff1 | diff2 | blob | history
scilab/etc/modules.xml.in diff1 | diff2 | blob | history
scilab/libs/MALLOC/Makefile.in diff1 | diff2 | blob | history
scilab/libs/Makefile.in diff1 | diff2 | blob | history
scilab/libs/doublylinkedlist/Makefile.in diff1 | diff2 | blob | history
scilab/libs/dynamiclibrary/Makefile.in diff1 | diff2 | blob | history
scilab/libs/hashtable/Makefile.in diff1 | diff2 | blob | history
scilab/libs/libst/Makefile.in diff1 | diff2 | blob | history
scilab/modules/Makefile.in diff1 | diff2 | blob | history
scilab/modules/action_binding/Makefile.in diff1 | diff2 | blob | history
scilab/modules/api_scilab/Makefile.in diff1 | diff2 | blob | history
scilab/modules/api_scilab/help/en_US/string_reading_api.xml diff1 | diff2 | blob | history
scilab/modules/arnoldi/Makefile.in diff1 | diff2 | blob | history
scilab/modules/atoms/Makefile.in diff1 | diff2 | blob | history
scilab/modules/boolean/Makefile.in diff1 | diff2 | blob | history
scilab/modules/cacsd/Makefile.in diff1 | diff2 | blob | history
scilab/modules/call_scilab/Makefile.in diff1 | diff2 | blob | history
scilab/modules/compatibility_functions/Makefile.in diff1 | diff2 | blob | history
scilab/modules/completion/Makefile.in diff1 | diff2 | blob | history
scilab/modules/console/Makefile.in diff1 | diff2 | blob | history
scilab/modules/core/Makefile.in diff1 | diff2 | blob | history
scilab/modules/core/includes/version.h diff1 | diff2 | blob | history
scilab/modules/data_structures/Makefile.in diff1 | diff2 | blob | history
scilab/modules/demo_tools/Makefile.in diff1 | diff2 | blob | history
scilab/modules/development_tools/Makefile.in diff1 | diff2 | blob | history
scilab/modules/development_tools/src/fake/Makefile.in diff1 | diff2 | blob | history
scilab/modules/differential_equations/Makefile.in diff1 | diff2 | blob | history
scilab/modules/double/Makefile.in diff1 | diff2 | blob | history
scilab/modules/dynamic_link/Makefile.in diff1 | diff2 | blob | history
scilab/modules/elementary_functions/Makefile.in diff1 | diff2 | blob | history
scilab/modules/fftw/Makefile.in diff1 | diff2 | blob | history
scilab/modules/fileio/Makefile.in diff1 | diff2 | blob | history
scilab/modules/functions/Makefile.in diff1 | diff2 | blob | history
scilab/modules/genetic_algorithms/Makefile.in diff1 | diff2 | blob | history
scilab/modules/graphic_export/Makefile.in diff1 | diff2 | blob | history
scilab/modules/graphics/Makefile.in diff1 | diff2 | blob | history
scilab/modules/gui/Makefile.in diff1 | diff2 | blob | history
scilab/modules/hdf5/Makefile.in diff1 | diff2 | blob | history
scilab/modules/helptools/Makefile.in diff1 | diff2 | blob | history
scilab/modules/history_manager/Makefile.in diff1 | diff2 | blob | history
scilab/modules/integer/Makefile.in diff1 | diff2 | blob | history
scilab/modules/interpolation/Makefile.in diff1 | diff2 | blob | history
scilab/modules/intersci/Makefile.in diff1 | diff2 | blob | history
scilab/modules/io/Makefile.in diff1 | diff2 | blob | history
scilab/modules/javasci/Makefile.in diff1 | diff2 | blob | history
scilab/modules/jvm/Makefile.in diff1 | diff2 | blob | history
scilab/modules/linear_algebra/Makefile.in diff1 | diff2 | blob | history
scilab/modules/localization/Makefile.in diff1 | diff2 | blob | history
scilab/modules/m2sci/Makefile.in diff1 | diff2 | blob | history
scilab/modules/maple2scilab/Makefile.in diff1 | diff2 | blob | history
scilab/modules/matio/Makefile.in diff1 | diff2 | blob | history
scilab/modules/mexlib/Makefile.in diff1 | diff2 | blob | history
scilab/modules/optimization/Makefile.in diff1 | diff2 | blob | history
scilab/modules/output_stream/Makefile.in diff1 | diff2 | blob | history
scilab/modules/overloading/Makefile.in diff1 | diff2 | blob | history
scilab/modules/parameters/Makefile.in diff1 | diff2 | blob | history
scilab/modules/polynomials/Makefile.in diff1 | diff2 | blob | history
scilab/modules/pvm/Makefile.in diff1 | diff2 | blob | history
scilab/modules/randlib/Makefile.in diff1 | diff2 | blob | history
scilab/modules/renderer/Makefile.in diff1 | diff2 | blob | history
scilab/modules/scicos/Makefile.in diff1 | diff2 | blob | history
scilab/modules/scicos_blocks/Makefile.in diff1 | diff2 | blob | history
scilab/modules/shell/Makefile.in diff1 | diff2 | blob | history
scilab/modules/signal_processing/Makefile.in diff1 | diff2 | blob | history
scilab/modules/simulated_annealing/Makefile.in diff1 | diff2 | blob | history
scilab/modules/sound/Makefile.in diff1 | diff2 | blob | history
scilab/modules/sparse/Makefile.in diff1 | diff2 | blob | history
scilab/modules/special_functions/Makefile.in diff1 | diff2 | blob | history
scilab/modules/spreadsheet/Makefile.in diff1 | diff2 | blob | history
scilab/modules/statistics/Makefile.in diff1 | diff2 | blob | history
scilab/modules/string/Makefile.in diff1 | diff2 | blob | history
scilab/modules/symbolic/Makefile.in diff1 | diff2 | blob | history
scilab/modules/tclsci/Makefile.in diff1 | diff2 | blob | history
scilab/modules/texmacs/Makefile.in diff1 | diff2 | blob | history
scilab/modules/time/Makefile.in diff1 | diff2 | blob | history
scilab/modules/umfpack/Makefile.in diff1 | diff2 | blob | history
scilab/modules/windows_tools/Makefile.in diff1 | diff2 | blob | history
scilab/modules/xcos/sci_gateway/c/gw_xcos.c diff1 | diff2 | blob | history
scilab/modules/xpad/Makefile.in diff1 | diff2 | blob | history
Scilab official GIT repository