Merge remote-tracking branch 'origin/master' into YaSp 01/12901/1
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Fri, 11 Oct 2013 13:21:27 +0000 (15:21 +0200)
committerCedric Delamarre <cedric.delamarre@scilab-enterprises.com>
Fri, 11 Oct 2013 13:21:27 +0000 (15:21 +0200)
commit07171b315182687e7cf75a856129f2b7a46df7f8
treec5840bbd4665beeef54d17eea501ed63f3cb9b62
parent6795851f11836fbf39cf0983dcaad6a58566cd76
parentcd40243952153db45a02cde7a95a27115f953a98
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/configure.ac
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/src/c/tmpdir.c
scilab/modules/dynamic_link/src/c/addinter.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dec2base.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fileinfo.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fullpath.c
scilab/modules/fileio/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_mputl.c
scilab/modules/fileio/sci_gateway/c/sci_mscanf.c
scilab/modules/fileio/sci_gateway/c/sci_msscanf.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/sci_gateway/c/sci_pathsep.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/fileio/src/c/do_xxscanf.c
scilab/modules/fileio/src/c/expandPathVariable.c
scilab/modules/fileio/src/c/fileinfo.c
scilab/modules/fileio/src/c/fullpath.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/fileio/src/c/readline.c
scilab/modules/fileio/src/c/scanf_functions.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/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_host.c
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/GetenvB.c
scilab/modules/localization/src/c/charEncoding.c
scilab/modules/scicos/sci_gateway/c/sci_buildouttb.c
scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_time.c
scilab/modules/scicos/sci_gateway/c/sci_set_blockerror.c
scilab/modules/scicos/src/c/extractblklist.c
scilab/modules/string/sci_gateway/c/sci_code2str.c
scilab/modules/string/sci_gateway/c/sci_convstr.c
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_isnum.c
scilab/modules/string/sci_gateway/c/sci_regexp.c
scilab/modules/string/sci_gateway/c/sci_strcat.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/sci_gateway/c/sci_strindex.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/sci_gateway/c/sci_strtok.c
scilab/modules/string/sci_gateway/c/sci_tokens.c
scilab/modules/string/src/c/stringsstrrev.c

Change-Id: Ifc88376594531cae9c549a218b6bc0e03d3589f0
74 files changed:
scilab/configure
scilab/configure.ac
scilab/desktop/Makefile.in
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/elementary_functions/sci_gateway/c/sci_base2dec.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dec2base.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_getURL.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_splitURL.c
scilab/modules/fileio/sci_gateway/c/sci_tempname.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/createtempfilename.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/fileio/src/c/do_xxscanf.c
scilab/modules/fileio/src/c/fileinfo.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/fullpath.c
scilab/modules/fileio/src/c/getlongpathname.c
scilab/modules/fileio/src/c/getrelativefilename.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/fileio/src/c/scanf_functions.c
scilab/modules/functions/sci_gateway/cpp/sci_exec.cpp
scilab/modules/gui/sci_gateway/c/sci_exportUI.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/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_fileManagement.c
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_save.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/getenvc.c
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/c/io.vcxproj.filters
scilab/modules/localization/src/c/charEncoding.c
scilab/modules/scicos/sci_gateway/c/sci_buildouttb.c
scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_time.c
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/scicos/sci_gateway/c/sci_set_blockerror.c
scilab/modules/scicos/src/c/MlistGetFieldNumber.c
scilab/modules/scicos/src/c/extractblklist.c
scilab/modules/scicos/src/c/sciblk4.c
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/tows_c.c
scilab/modules/string/src/c/partfunction.c
scilab/modules/string/src/c/stringToComplex.c
scilab/modules/string/src/c/stringsstrrev.c
scilab/modules/string/src/c/strsubst.c