Merge remote-tracking branch 'origin/master' into yasp 79/12279/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Tue, 13 Aug 2013 22:03:07 +0000 (00:03 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 14 Aug 2013 08:14:16 +0000 (10:14 +0200)
commit5a8d098add4b3e5343f60f06c9166fc02faf1301
treea7b23fcf1871070f83bf36c7b34135f17e35f8c0
parentb7633c3840605c61f4437df2e3f3ac55a46b1c37
parentdff2a126598b77e642be19c5056a2f89bbd21b60
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/src/jni/Completion_wrap.c
scilab/modules/console/src/jni/DropFiles_wrap.c
scilab/modules/console/src/jni/GuiManagement_wrap.c
scilab/modules/core/includes/returnProperty.h
scilab/modules/core/src/c/returnProperty.c
scilab/modules/double/src/c/double.vcxproj
scilab/modules/double/src/fortran/double_f2c.vcxproj
scilab/modules/dynamic_link/src/fortran/dynamic_link_f2c.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/functions/src/fortran/functions_f2c.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/gui/src/jni/ScilabTermination_wrap.c
scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c
scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcxproj
scilab/modules/intersci/src/exe/interscin/interscin.vcxproj
scilab/modules/intersci/src/lib/intersci.vcxproj
scilab/modules/io/src/fortran/io_f2c.vcxproj
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/localization/src/jni/LocaleToLCID_wrap.c
scilab/modules/localization/src/jni/Messages_wrap.c
scilab/modules/localization/src/jni/setdefaultlanguage_wrap.c
scilab/modules/scinotes/src/jni/ScilabKeywords_wrap.c
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/fortran/string_f2c.vcxproj
scilab/modules/types/src/cpp/ScilabToJava.cpp
scilab/modules/types/src/jni/ScilabVariables.giws.xml
scilab/modules/types/src/jni/getScilabVariable_wrap.c
scilab/modules/types/types.vcxproj
scilab/modules/ui_data/src/jni/ui_data_wrap.c
scilab/tools/Dumpexts/winDumpExts.c

Change-Id: I50ce66384949ac2604788f83f682da094ac6b819
175 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/includes/returnProperty.h
scilab/modules/api_scilab/src/cpp/returnProperty.cpp
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/ast/ast-tools/ast-tools.vcxproj
scilab/modules/ast/ast.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/nocompletion/nocompletion.vcxproj
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/sci_gateway/cpp/core_gw.vcxproj
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/data_structures/src/fortran/data_structures_f2c.vcxproj
scilab/modules/differential_equations/sci_gateway/differential_equations_gw.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/external_objects/external_objects.vcxproj
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/src/nofftw/nofftw.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/scripts/buildmacros/BuildMacros.vcxproj
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcxproj
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/sci_gateway/c/sci_matplot1.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_image_type_property.c
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/src/BuildChm/BuildChm.vcxproj
scilab/modules/helptools/src/BuildHelp.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/cpp/integer_gw.vcxproj
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_ScilabJNI.java
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/fortran/linear_algebra_f2c.vcxproj
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/src/localization.vcxproj
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/operations/operations.vcxproj
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/optimization/src/fortran/optimization_f2c.vcxproj
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/fortran/output_stream_f2c.vcxproj
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/parameters.vcxproj
scilab/modules/parse/parse.vcxproj
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/polynomials/src/fortran/polynomials_f2c.vcxproj
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/randlib/src/norandlib/norandlib.vcxproj
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/src/c/noscicos/noscicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcxproj
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/src/nosound/nosound.vcxproj
scilab/modules/sparse/sci_gateway/cpp/sparse_gw.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/fortran/sparse_f2c.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcxproj
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/symbol/symbol.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/system_env/system_env.vcxproj
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/threads/threads.vcxproj
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/time/time.vcxproj
scilab/modules/types/sci_gateway/cpp/types_gw.vcxproj
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariable.java
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/ScilabVariables.cpp
scilab/modules/types/src/jni/ScilabVariables.giws.xml
scilab/modules/types/src/jni/ScilabVariables.hxx
scilab/modules/types/src/jni/ScilabVariablesRefresh.cpp
scilab/modules/types/src/jni/ScilabVariablesRefresh.hxx
scilab/modules/types/types.vcxproj
scilab/modules/types/typesjni/typesjni.vcxproj
scilab/modules/types/typesjni/typesjni.vcxproj.filters
scilab/modules/types/typesmacro/typesmacro.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/umfpack/src/c/umfpack.vcxproj
scilab/modules/umfpack/src/noumfpack/noumfpack.vcxproj
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xml/xml.vcxproj
scilab/tools/Dumpexts/Dumpexts.vcxproj
scilab/tools/localization/generatePoFile.vcxproj