Merge remote-tracking branch 'origin/master' into yasp 51/12251/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 9 Aug 2013 12:30:49 +0000 (14:30 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 9 Aug 2013 12:30:49 +0000 (14:30 +0200)
commit7b165eea39c8cb304c02f17d5123fcd34db7b8c6
tree8495d39d5ea7216ff8acb7fc3d721e3da9b4bc12
parent1fadb6d74ec57cd707cb28cbba396167c24f9678
parentd25fba5ecbef4874cdf47f699f1aea1c0e8c2a12
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/etc/scilab.start
scilab/modules/core/src/c/parse.c
scilab/modules/core/src/c/run.c
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack2.c
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/data_structures/src/c/hmops.c
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_bvode.f
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_dasrt.f
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_dassl.f
scilab/modules/differential_equations/tests/unit_tests/dassldasrt.dia.ref
scilab/modules/differential_equations/tests/unit_tests/dassldasrt.tst
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_dsearch.f
scilab/modules/elementary_functions/tests/unit_tests/erfc.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/erfc.tst
scilab/modules/fileio/sci_gateway/c/sci_getrelativefilename.c
scilab/modules/fileio/sci_gateway/c/sci_removedir.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/intersci/tests/nonreg_tests/bug_4625.c
scilab/modules/intersci/tests/nonreg_tests/bug_7599.c
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/overloading/macros/%s_pow.sci
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/src/c/extractblklist.c
scilab/modules/statistics/sci_gateway/c/sci_cdfpoi.c

Change-Id: I9d3ac578b33897409727310d16b39cb52c4489a8
31 files changed:
scilab/configure
scilab/configure.ac
scilab/modules/cacsd/sci_gateway/c/sci_linmeq.c
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/data_structures/src/c/core_Import.def
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/fileio/tests/unit_tests/mgeti.dia.ref
scilab/modules/fileio/tests/unit_tests/mgeti.tst
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/gui/gui.iss
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_h5dataset.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_percent_H5Object_e.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/cpp/H5BasicData.hxx
scilab/modules/hdf5/src/cpp/H5CompoundData.cpp
scilab/modules/overloading/macros/generic_i_h.sci
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/src/c/extractblklist.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/special_functions/sci_gateway/c/sci_legendre.c
scilab/modules/statistics/src/c/CdfBase.c