Merge remote-tracking branch 'origin/master' into YaSp 48/12848/4
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Tue, 8 Oct 2013 08:22:26 +0000 (10:22 +0200)
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Tue, 8 Oct 2013 16:06:15 +0000 (18:06 +0200)
commitb801bd37c0b74af02e3b187313cd96834f5e7a75
tree32556ad7dc2f015d0b69e668e6b5d025ab80607d
parentd61ffb1f9917410f7c40c7bd87485545e57d244e
parentbbccfa4cd0030252225d3f34cf6f5af1ce6bef2c
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Version.incl
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_handle.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_pointer.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/run.c
scilab/modules/core/src/c/stack2.c
scilab/modules/differential_equations/sci_gateway/fortran/bbvode.f
scilab/modules/differential_equations/sci_gateway/fortran/bfeval.f
scilab/modules/differential_equations/sci_gateway/fortran/bjac.f
scilab/modules/differential_equations/sci_gateway/fortran/bjacd.f
scilab/modules/differential_equations/sci_gateway/fortran/bresd.f
scilab/modules/differential_equations/sci_gateway/fortran/bsurf.f
scilab/modules/differential_equations/sci_gateway/fortran/bsurfd.f
scilab/modules/differential_equations/sci_gateway/fortran/bydot.f
scilab/modules/differential_equations/sci_gateway/fortran/bydot2.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_eye.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_ones.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_rand.f
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_zeros.f
scilab/modules/external_objects_java/sci_gateway/c/gw_external_objects_java.c
scilab/modules/fileio/tests/unit_tests/mgeti.dia.ref
scilab/modules/fileio/tests/unit_tests/mgeti.tst
scilab/modules/fileio/tests/unit_tests/mputi.dia.ref
scilab/modules/fileio/tests/unit_tests/mputi.tst
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_segs_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/integer/src/fortran/i_mput.f
scilab/modules/localization/sci_gateway/c/sci_addlocalizationdomain.c
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/fortran/sciblk.f
scilab/modules/signal_processing/sci_gateway/fortran/bgetx.f
scilab/modules/signal_processing/sci_gateway/fortran/bgety.f
scilab/modules/spreadsheet/sci_gateway/c/sci_csvDefault.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/src/c/checkCsvWriteFormat.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/statistics/tests/nonreg_tests/bug_3640.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_3640.tst
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/src/cpp/XMLList.cpp
scilab/modules/xml/src/cpp/XMLObject.cpp
scilab/modules/xml/src/cpp/XMLObject.hxx
scilab/modules/xml/src/cpp/XMLRhsValue.hxx

Change-Id: I78676cc929f4116b6cda9f1f6af7afb7d54c9f17
172 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/bin.iss
scilab/bin/scilab
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj.filters
scilab/modules/api_scilab/includes/api_internal_handle.h
scilab/modules/api_scilab/includes/returnProperty.h
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_handle.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_pointer.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/core/includes/callinter.h.f
scilab/modules/core/includes/callinterf.h
scilab/modules/core/sci_gateway/c/sci_what.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/tests/unit_tests/intg.dia.ref
scilab/modules/differential_equations/tests/unit_tests/ode.tst
scilab/modules/elementary_functions/sci_gateway/c/sci_base2dec.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dec2base.c
scilab/modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
scilab/modules/fftw/sci_gateway/c/sci_dct.c
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/fileio/macros/%_listvarinfile.sci
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/fileio/tests/unit_tests/mgeti.tst
scilab/modules/fileio/tests/unit_tests/mputi.dia.ref
scilab/modules/fileio/tests/unit_tests/mputi.tst
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/core_Import.def
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/includes/gw_graphics.h
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_light.c
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_xarrows.c
scilab/modules/graphics/src/c/GetProperty.c
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_ambient_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_children_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_bounds_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_datatip_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_diffuse_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_closerequestfcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_resizefcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_grid_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_light_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_log_flags_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_material_shininess_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_segs_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_specular_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_sub_tics_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_triangles_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_use_color_material_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_user_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_xtics_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_ytics_coord_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_z_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/cpp/sci_datatip_manager_mode.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_display.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_interp.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_orient.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_style.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_toggle.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipcreate.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipmove.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatipremove.cpp
scilab/modules/gui/sci_gateway/cpp/sci_openged.cpp
scilab/modules/gui/sci_gateway/cpp/sci_plotbrowser.cpp
scilab/modules/gui/sci_gateway/cpp/sci_useeditor.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/src/cpp/H5CompoundData.cpp
scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java
scilab/modules/localization/sci_gateway/c/sci_addlocalizationdomain.c
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/readau.c
scilab/modules/scicos_blocks/src/c/readc.c
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/scicos_blocks/src/fortran/sciblk.f
scilab/modules/signal_processing/sci_gateway/fortran/bgetx.f
scilab/modules/signal_processing/sci_gateway/fortran/bgety.f
scilab/modules/signal_processing/src/fortran/core_Import.def
scilab/modules/signal_processing/src/fortran/core_f_Import.def
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/spreadsheet/sci_gateway/c/gw_csv_helpers.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvDefault.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvStringToDouble.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvWrite.c
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/src/c/checkCsvWriteFormat.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/csvWrite.c
scilab/modules/statistics/tests/nonreg_tests/bug_3640.dia.ref
scilab/modules/statistics/tests/nonreg_tests/bug_3640.tst
scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGet.cpp
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xcos/src/jni/Palette.giws.xml
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_e.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_c_i_XMLAttr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlIsValidObject.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlName.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlReadStr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/src/c/XMLMlistsManagement.c