Merge remote branch 'origin/master' into YaSp 24/2524/1
authorBruno JOFRET <bruno.jofret@scilab.org>
Fri, 19 Nov 2010 10:14:04 +0000 (11:14 +0100)
committerBruno JOFRET <bruno.jofret@scilab.org>
Fri, 19 Nov 2010 10:14:04 +0000 (11:14 +0100)
commit32160b04e4b96b60954c36507e3237373ba8d9c7
treea3b1c5ed92ebd841aea2d36a7e0f84278c0d8482
parent1c96f1a28c03127688ff3d4330b7c570d1b15b85
parenta6020e2ca707d93359bf20be5f10fdbadaa878f7
Merge remote branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/includes/api_int.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/completion/src/c/getCommonPart.c
scilab/modules/completion/src/jni/Completion_wrap.c
scilab/modules/console/src/jni/DropFiles_wrap.c
scilab/modules/core/includes/stack3.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/stack3.c
scilab/modules/core/src/c/tmpdir.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/output_stream/macros/prettyprint.sci
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/parameters/src/c/parameters.c
scilab/modules/scicos/demos/control_systems.dem.gateway.sce
scilab/modules/scicos/demos/electrical_systems.dem.gateway.sce
scilab/modules/scicos/demos/live.dem.gateway.sce
scilab/modules/scicos/demos/mechanical_systems.dem.gateway.sce
scilab/modules/scicos/demos/modelica_demos.dem.gateway.sce
scilab/modules/scicos/demos/old_demos.dem.gateway.sce
scilab/modules/scicos/demos/scicos.dem.gateway.sce
scilab/modules/scicos/demos/standard.dem.gateway.sce
scilab/modules/scicos/locales/fr_FR/scicos.po
scilab/modules/scicos/locales/it_IT/scicos.po
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/src/c/ScilabKeywords.c
scilab/modules/shell/src/c/windows/TermCompletion.c
scilab/modules/statistics/sci_gateway/c/sci_cdfgam.c
scilab/modules/string/src/c/string.vcproj
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalCategoryAdd.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDelete.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDisable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalEnable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalMove.cpp
scilab/modules/xcos/src/cpp/xcosUtilities.cpp

Change-Id: I430ca110131b9cef06e9e6fda4035f48da254781
180 files changed:
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
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/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_boolean.h
scilab/modules/api_scilab/includes/api_boolean_sparse.h
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/includes/api_double.h
scilab/modules/api_scilab/includes/api_int.h
scilab/modules/api_scilab/includes/api_list.h
scilab/modules/api_scilab/includes/api_pointer.h
scilab/modules/api_scilab/includes/api_poly.h
scilab/modules/api_scilab/includes/api_sparse.h
scilab/modules/api_scilab/includes/api_string.h
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_internal_double.h
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
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/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/completion/src/c/getCommonPart.c
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/dropFiles.c
scilab/modules/core/Makefile.in
scilab/modules/core/includes/sci_types.h
scilab/modules/core/includes/stack3.h
scilab/modules/core/src/c/stack3.c
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.in
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/functions/Makefile.in
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
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/javasci/Makefile.in
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/javasci/src/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
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/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/operations/includes/doublecomplex.h
scilab/modules/operations/src/c/doublecomplex.c
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/src/c/parameters.c
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.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/c/ScilabKeywords.c
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/shell/src/c/windows/TermCompletion.c
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/sci_gateway/c/sci_cdfgam.c
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/types/includes/double.hxx
scilab/modules/types/includes/matrixpoly.hxx
scilab/modules/types/src/cpp/double.cpp
scilab/modules/types/src/cpp/matrixpoly.cpp
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalCategoryAdd.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDelete.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDisable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalEnable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalMove.cpp
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xcos/src/cpp/xcosUtilities.cpp
scilab/tools/innosetup/base.iss