Merge remote-tracking branch 'origin/master' into YaSp 66/8866/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 29 Aug 2012 15:02:01 +0000 (17:02 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Wed, 29 Aug 2012 15:21:11 +0000 (17:21 +0200)
commitf56fb38e861cb9e5cf924ab2c4eb8fa4423b6457
treec76ef9051f531efa8b33dbc603a23c22cfb74b12
parent16a7eba0feeb51cc733232cef583486436722886
parent274f7c8afb4b6ac64b43497181fa7bbf01f26003
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/src/c/stack2.c
scilab/modules/fileio/sci_gateway/c/sci_filesep.c
scilab/modules/fileio/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/fileio/sci_gateway/c/sci_pathsep.c
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/includes/h5_writeDataToFile.h
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/c/h5_fileManagement.c
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
scilab/modules/interpolation/sci_gateway/c/sci_linear_interpn.c
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/linear_algebra/macros/norm.sci
scilab/modules/localization/sci_gateway/c/sci_getlanguage.c
scilab/modules/matio/tests/unit_tests/loadmatfile.tst
scilab/modules/overloading/macros/%hm_max.sci
scilab/modules/overloading/macros/%hm_min.sci
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/sci_gateway/c/gw_sparse.c
scilab/modules/sparse/sci_gateway/c/sci_spmax.c
scilab/modules/sparse/sci_gateway/c/sci_spmin.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/windows_tools/sci_gateway/c/sci_mcisendstring.c

Change-Id: Ie046a804eb1b8698cf22929a39bf692b81faebd0
42 files changed:
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/arnoldi/sci_gateway/c/sci_eigs.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/includes/gw_hdf5.h
scilab/modules/hdf5/includes/import_from_hdf5_v1.hxx
scilab/modules/hdf5/includes/listvar_in_hdf5_v1.hxx
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
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/sci_gateway/hdf5_gateway.xml
scilab/modules/hdf5/src/c/core_Import.def
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/c/hdf5.vcxproj
scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
scilab/modules/interpolation/sci_gateway/c/sci_eval_cshep2d.c
scilab/modules/interpolation/sci_gateway/c/sci_linear_interpn.c
scilab/modules/linear_algebra/macros/cond.sci
scilab/modules/localization/sci_gateway/c/sci_getlanguage.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj.filters
scilab/modules/statistics/tests/unit_tests/cdfbet.tst
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
scilab/modules/windows_tools/sci_gateway/c/sci_mcisendstring.c
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj.filters
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c