Merge remote-tracking branch 'origin/master' into YaSp 13/14913/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 18 Jul 2014 15:29:09 +0000 (17:29 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 18 Jul 2014 15:29:09 +0000 (17:29 +0200)
commitc821a20804a004646a2030bc2c4e6bb434aa3248
treec3df017207ac9c947c5ab59e27553c55ed665891
parent5855e0ef204ba0698fb40c969242774d1cf30a6b
parent86427d492655e005c7b9cf98cf18cbe2ff863976
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/overloading/macros/%s_pow.sci

Change-Id: Iee31c97326ebdde84f09b2a102a95f1ba0c866f8
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/atoms/etc/repositories
scilab/modules/atoms/tests/unit_tests/repositories.orig
scilab/modules/javasci/Makefile.in