Merge remote-tracking branch 'origin/master' into YaSp 50/15250/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 19 Sep 2014 07:47:49 +0000 (09:47 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 19 Sep 2014 07:47:49 +0000 (09:47 +0200)
commit1e10bbd7e1c21eab5d71ea86d1a0265675ad3c6b
tree35a290c79467d2fa96dcf5f025536039dc08b714
parent39775b8291524943be8cc0f99a381163989ab14b
parent9e7ee5078816772555298d8fd6882a6c59ff4aee
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/javasci/Makefile.in
scilab/modules/polynomials/sci_gateway/fortran/sci_f_bezout.f

Change-Id: Id25f0afcb649b3881ff0c8bb27261a8c80e1dca8
scilab/configure
scilab/configure.ac
scilab/modules/core/includes/machine.h.in
scilab/modules/graphics/src/c/getHandleProperty/set_border_property.c
scilab/modules/matio/tests/unit_tests/savematfile.tst
scilab/modules/xml/tests/unit_tests/xmlAddNs.tst
scilab/modules/xml/tests/unit_tests/xmlRead.tst