Merge remote-tracking branch 'origin/master' into YaSp 95/12595/3
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Thu, 19 Sep 2013 10:08:08 +0000 (12:08 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 19 Sep 2013 13:36:54 +0000 (15:36 +0200)
commitc5a5b89c6cc05526b4b3b6c66da6f01bb2bd3381
treea8caa6c9309f0018889dd0609de1fabc797921e1
parentfac55ba4d22d19fc31cc28425ce48f8277d4e430
parentab8b90bd35023438441e53e4eb62205b64bde367
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Version.incl
scilab/aclocal.m4
scilab/configure
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.in
scilab/modules/compatibility_functions/macros/%b_prod.sci
scilab/modules/compatibility_functions/macros/%b_sum.sci
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/completion/src/cpp/FieldsManager.cpp
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/fortran/getfun.f
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/macros/windows/dlwGetScilabLibraries.sci
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_cumprod.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_cumsum.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sum.f
scilab/modules/fileio/includes/mseek.h
scilab/modules/fileio/sci_gateway/c/sci_mseek.c
scilab/modules/fileio/src/c/mget.c
scilab/modules/fileio/src/c/mseek.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/intersci/Makefile.in
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/io/sci_gateway/fortran/intfile.f
scilab/modules/io/src/fortran/newsave.f
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/includes/localization.h
scilab/modules/localization/sci_gateway/c/gw_localization.c
scilab/modules/localization/sci_gateway/c/sci_dgettext.c
scilab/modules/localization/sci_gateway/c/sci_gettext.c
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/overloading/macros/%hm_prod.sci
scilab/modules/overloading/macros/%hm_sum.sci
scilab/modules/overloading/macros/%p_prod.sci
scilab/modules/overloading/macros/%p_sum.sci
scilab/modules/overloading/macros/%sp_prod.sci
scilab/modules/overloading/macros/%sp_sum.sci
scilab/modules/overloading/macros/%spb_sum.sci
scilab/modules/scicos/sci_gateway/c/sci_callblk.c
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/windows_tools/etc/windows_tools.start
scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c

Change-Id: I76f8722e77b44325cb69e982c6fd7eb771d783ce
142 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Version.incl
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_scilab.h
scilab/modules/arnoldi/Makefile.in
scilab/modules/ast/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/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/cpp/FieldsManager.cpp
scilab/modules/completion/src/cpp/StructFieldsGetter.cpp
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/cmdLine/autoCompletionCli.c
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/macros/daeoptions.sci
scilab/modules/differential_equations/tests/unit_tests/dae.tst
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/macros/windows/dlwGetScilabLibraries.sci
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/macros/%sp_cumprod.sci
scilab/modules/elementary_functions/macros/%sp_cumsum.sci
scilab/modules/elementary_functions/macros/%spb_cumprod.sci
scilab/modules/elementary_functions/macros/%spb_cumsum.sci
scilab/modules/elementary_functions/macros/%spb_prod.sci
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
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/graphic_objects/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_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/includes/localization.h
scilab/modules/localization/sci_gateway/c/gw_localization.c
scilab/modules/localization/sci_gateway/c/sci_addlocalizationdomain.c
scilab/modules/localization/sci_gateway/cpp/localization_gw.cpp
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj.filters
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/mpi/Makefile.in
scilab/modules/mpi/macros/MPIPi.sci
scilab/modules/operations/Makefile.in
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/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/sci_gateway/c/sci_callblk.c
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/scicos/src/c/sciblk4.c
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/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/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/threads/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/etc/windows_tools.start
scilab/modules/windows_tools/src/c/WinConsole.c
scilab/modules/xcos/Makefile.in
scilab/modules/xml/Makefile.in
scilab/test/good/%b_cumprod.sci
scilab/test/good/%b_cumsum.sci
scilab/test/good/%p_cumprod.sci
scilab/test/good/%p_cumsum.sci