Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp 13/4613/3
authorAllan CORNET <allan.cornet@scilab.org>
Wed, 27 Jul 2011 12:37:38 +0000 (14:37 +0200)
committerVincent COUVERT <vincent.couvert@scilab.org>
Wed, 27 Jul 2011 14:50:19 +0000 (16:50 +0200)
commit4e2a3be10b645935560960b7d76c75751cfaeb9d
treefc73bd31a6eac3e045ebfe2392a96c7a8aae3778
parent64e936b469880d578eae6bddb2032a113ff3685b
parent6d8fcc182f4c637b64450e0f29577b99c111a9a3
Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp

Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/LibScilab/LibScilab.vcxproj
scilab/modules/Makefile.in
scilab/modules/api_scilab/LibScilab_Import.def
scilab/modules/api_scilab/Scilab_windows_Import.def
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/LibScilab_Import.def
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/c/others/initMacOSXEnv.c
scilab/modules/console/src/c/others/initMacOSXEnv.h
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/csignal.c
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/sci_gateway/c/sci_mscanf.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/helptools/src/BuildChm/BuildChm.vcxproj
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/localization/includes/charEncoding.h
scilab/modules/localization/src/c/charEncoding.c
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/sci_gateway/c/sci_mprintf.c
scilab/modules/output_stream/src/c/Shell_Import.def
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/pvm/pvm.vcxproj
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/macros/scicos_scicos/do_load.sci
scilab/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci
scilab/modules/scicos/macros/scicos_scicos/getlink.sci
scilab/modules/scicos/macros/scicos_scicos/getlink_qd.sci
scilab/modules/scicos/macros/scicos_scicos/look_for_text.sci
scilab/modules/scicos/macros/scicos_utils/create_gif.sci
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/includes/gw_shell.h
scilab/modules/shell/sci_gateway/c/sci_iswaitingforinput.c
scilab/modules/shell/sci_gateway/c/sci_lines.c
scilab/modules/shell/shell.iss
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/LibScilab_Import.def
scilab/modules/shell/src/c/more.c
scilab/modules/shell/src/c/shell.rc
scilab/modules/shell/src/c/shell.vcxproj
scilab/modules/shell/src/c/shell.vcxproj.filters
scilab/modules/shell/src/java/shell-JAVA.vcxproj
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj.filters
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/code.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/icons.iss

Change-Id: Ida57c2d42866a7b3c9e72b0117bf794d2dbdf83c
83 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/libs/LibScilab/LibScilab.vcxproj
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj.filters
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/console.iss
scilab/modules/console/includes/gw_console.h
scilab/modules/console/sci_gateway/c/gw_console.c
scilab/modules/console/sci_gateway/c/sci_iswaitingforinput.c
scilab/modules/console/sci_gateway/c/sci_lines.c
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/c/InitializeConsole.c
scilab/modules/console/src/c/LibScilab_Import.def
scilab/modules/console/src/c/Scilab_windows_Import.def
scilab/modules/console/src/c/TermReadAndProcess.h
scilab/modules/console/src/c/clc.c
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/c/more.c
scilab/modules/console/src/c/others/initMacOSXEnv.c
scilab/modules/console/src/c/others/zzledt.c
scilab/modules/console/src/c/prompt.c
scilab/modules/console/src/c/promptecho.c
scilab/modules/console/src/c/scilines.c
scilab/modules/console/src/c/tohome.c
scilab/modules/console/src/c/windows/TermCommand.c
scilab/modules/console/src/c/windows/TermCompletion.c
scilab/modules/console/src/c/windows/TermConsole.c
scilab/modules/console/src/c/windows/TermLine.c
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj.filters
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core_yasp.vcxproj
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/csignal.c
scilab/modules/core/src/cpp/scilab.cpp
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/src/c/getmacroslist.c
scilab/modules/graphics/src/c/getHandleProperty/setGetHashTable.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/helptools/helptools.iss
scilab/modules/jvm/src/java/jvm-JAVA.vcxproj
scilab/modules/localization/src/c/charEncoding.c
scilab/modules/matio/src/c/CreateCharVariable.c
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/Console_Import.def
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/signal_processing/tests/unit_tests/amell.tst
scilab/modules/signal_processing/tests/unit_tests/syredi.tst
scilab/modules/string/src/c/string.vcxproj
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/base.iss
scilab/tools/innosetup/code.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss
scilab/tools/innosetup/icons.iss