Merge remote-tracking branch 'origin/master' into yasp 70/11770/3
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 20 Jun 2013 13:47:39 +0000 (15:47 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 20 Jun 2013 15:22:47 +0000 (17:22 +0200)
commita28d3ba256d89f3d52431669912969ea935d030e
tree1d73a305797ec13f324a004bd9dbe77561670323
parenta3522a1c0b220621c6254b269d340fbaea86449d
parent3eb9fae6cf6afaf2aa3695f6feff302f31d4cee7
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/scilab
scilab/modules/call_scilab/examples/call_scilab/c/common/myprog.c
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/fortran/fact.f
scilab/modules/differential_equations/sci_gateway/fortran/intg.f
scilab/modules/differential_equations/src/fortran/core_Import.def
scilab/modules/double/sci_gateway/fortran/matxpow.f
scilab/modules/double/src/fortran/Elementary_functions_f_Import.def
scilab/modules/double/tests/nonreg_tests/bug_3006.dia.ref
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_maxi.f
scilab/modules/fileio/sci_gateway/c/sci_filesep.c
scilab/modules/fileio/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/mget.c
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/statistics/sci_gateway/c/sci_cdfchi.c
scilab/modules/statistics/sci_gateway/c/sci_cdfchn.c
scilab/modules/statistics/sci_gateway/c/sci_cdff.c
scilab/modules/statistics/sci_gateway/c/sci_cdffnc.c
scilab/modules/statistics/sci_gateway/c/sci_cdfpoi.c
scilab/modules/statistics/sci_gateway/c/sci_cdft.c
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp

Change-Id: I6031b87db38025b5521ac07d2c8fa8ce217bc47a
42 files changed:
scilab/bin/scilab
scilab/modules/ast/includes/runvisitor.hxx
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/core/includes/initMacOSXEnv.h
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/cpp/scilab.cpp
scilab/modules/development_tools/macros/bench_run.sci
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/DllmainDifferential_equations.c
scilab/modules/differential_equations/src/fortran/differential_equations_Import.def
scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj.filters
scilab/modules/fftw/sci_gateway/c/sci_disposefftwlibrary.c
scilab/modules/fftw/sci_gateway/c/sci_loadfftwlibrary.c
scilab/modules/fftw/src/c/fftw_utilities.c
scilab/modules/fftw/src/c/fftwlibname.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/optimization/sci_gateway/c/sci_qp_solve.c
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/sci_gateway/c/gw_scicos.c
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/sci_gateway/cpp/sci_browsevar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_updatebrowsevar.cpp
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp