projects / scilab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49be97c e6bb34a) | patch
Merge commit 'origin/master' into Xcos
authorPierre MARECHAL <pierre.marechal@scilab.org>
Thu, 8 Oct 2009 09:43:54 +0000 (11:43 +0200)
committerPierre MARECHAL <pierre.marechal@scilab.org>
Thu, 8 Oct 2009 09:43:54 +0000 (11:43 +0200)
commit065dba6a0d44c2111e57e3f2cfca0ec21b0a25cc
tree99240a3d0878eaf146282f82d0c46dd6477782d8tree | snapshot
parent49be97c171c4e7281b53b0d1f5758cb330e3c844commit | diff
parente6bb34a2151dd4e126d51062e2ab389ecbb85439commit | diff
Merge commit 'origin/master' into Xcos

Conflicts:
scilab/Version.incl
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/version.h
88 files changed:
scilab/Makefile.in diff1 | diff2 | blob | history
scilab/build.incl.xml 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/etc/modules.xml.vc 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.am 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/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/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/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp diff1 | diff2 | blob | history
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp 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/metanet/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/scipad/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/Makefile.in diff1 | | blob | history
scilab/modules/xpad/Makefile.in diff1 | diff2 | blob | history
scilab/scilab-lib.properties.in diff1 | diff2 | blob | history
Scilab official GIT repository