Merge remote-tracking branch 'origin/master' into YaSp 50/14850/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 08:57:23 +0000 (10:57 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 08:57:23 +0000 (10:57 +0200)
commit361fc12cd8d266a01298bce7fcf0b52ce23e7cf2
tree84c05b29d76db28364db66845cd0a54420eb9281
parent5281e5033e50ff16e8c65c1e2ef3c4cc01b3ba79
parentafe150ae2756eef80000b519de439b6a7d562757
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/core/src/c/tmpdir.c
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_kron.f
scilab/modules/fileio/etc/fileio.start
scilab/modules/javasci/Makefile.in
scilab/modules/overloading/macros/%s_pow.sci

Change-Id: Ib756fbd620b6cca56b9d67bdc2a17d5462202e6c
19 files changed:
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/core/sci_gateway/c/sci_error.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/development_tools/tests/unit_tests/assert/checkequal.dia.ref
scilab/modules/development_tools/tests/unit_tests/assert/checkequal.tst
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/src/c/getFullFilename.c
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/javasci/Makefile.in
scilab/modules/localization/sci_gateway/c/sci_addlocalizationdomain.c
scilab/modules/xml/sci_gateway/cpp/sci_xmlNs.cpp
scilab/scilab-lib.properties.in