Merge remote-tracking branch 'origin/master' into YaSp 06/12106/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 23 Jul 2013 07:22:05 +0000 (09:22 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 23 Jul 2013 07:22:05 +0000 (09:22 +0200)
commitb478915a1f3832c29a0963a61b8cae9472e22c17
tree483781cc62890c5713e201fd9ebcc4c5ae33002f
parent97111d43b72851b8ac94a218fb1f87b1d15dfeca
parent706b7d64ccadfd2c48f22327d491c75ee90b1c61
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/core/tests/nonreg_tests/bug_3296.dia.ref
scilab/modules/core/tests/nonreg_tests/bug_3296.tst
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_bvode.f
scilab/modules/fileio/tests/unit_tests/mtell.tst
scilab/modules/output_stream/src/c/errorTable.c

Change-Id: Ib362ef74a4feb81bfa4370cfbe6bef4f4a5a8d51
16 files changed:
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/modules/cacsd/macros/ccontrg.sci
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/data_structures/src/c/core_Import.def
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/fileio/tests/unit_tests/mtell.tst
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/helptools/helptools.iss
scilab/modules/polynomials/src/fortran/dpsimp.f
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj