Merge remote-tracking branch 'remotes/origin/master' into VS2010 13/3913/1
authorAllan CORNET <allan.cornet@scilab.org>
Mon, 2 May 2011 10:06:21 +0000 (12:06 +0200)
committerAllan CORNET <allan.cornet@scilab.org>
Mon, 2 May 2011 10:06:21 +0000 (12:06 +0200)
commit190293b3fc75eae338cdfefba5157842831f000c
treea839c4f3e7467fcd21c6365c1e415a348eeb1e2c
parentd06a9bc09369416b79a7e9c0f6e8e1f8445c8f04
parenta480c36f24d090a7d8e70ed7d1af37ed429a3740
Merge remote-tracking branch 'remotes/origin/master' into VS2010

Conflicts:
scilab/CHANGES_5.4.X
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcproj
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/commons/src/c/commons.vcproj
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/core/src/c/core.vcproj
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fftw/fftw.vcproj
scilab/modules/fileio/fileio.vcproj
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphics/graphics.vcproj
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/src/c/history_browser.vcproj
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/io/src/c/io.vcproj
scilab/modules/jvm/libjvm.vcproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/localization/src/localization.vcproj
scilab/modules/matio/matio.vcproj
scilab/modules/optimization/src/c/optimization.vcproj
scilab/modules/parameters/parameters.vcproj
scilab/modules/polynomials/src/c/polynomials.vcproj
scilab/modules/pvm/pvm.vcproj
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/renderer/renderer.vcproj
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
scilab/modules/scinotes/src/c/scinotes.vcproj
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/sound/sound.vcproj
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/sparse/src/fortran/sparse_f2c.vcproj
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbolic/src/c/symbolic.vcproj
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/time/time.vcproj
scilab/modules/ui_data/src/c/ui_data.vcproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/xcos/src/c/xcos.vcproj

Change-Id: Ice544b44db91f787051c3588621d396807602ecc
46 files changed:
scilab/CHANGES_5.4.X
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj.filters
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/arnoldi/arnoldi.vcxproj.filters
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/call_scilab/call_scilab.vcxproj.filters
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/c/completion.vcxproj.filters
scilab/modules/core/.gitignore
scilab/modules/core/includes/version.h
scilab/modules/core/includes/version.h.vc
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/getstaticDebugInfo_Windows.c
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/fftw.vcxproj.filters
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj.filters
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/helptools/.gitignore
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/matio.vcxproj.filters
scilab/modules/parameters/parameters.vcxproj
scilab/modules/parameters/parameters.vcxproj.filters
scilab/modules/pvm/pvm.vcxproj
scilab/modules/pvm/pvm.vcxproj.filters
scilab/modules/renderer/renderer.vcxproj
scilab/modules/renderer/renderer.vcxproj.filters
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/sound.vcxproj.filters
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/tclsci/tclsci.vcxproj.filters
scilab/modules/time/time.vcxproj
scilab/modules/time/time.vcxproj.filters
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj.filters