Merge remote-tracking branch 'origin/master' into YaSp 20/16320/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 3 Apr 2015 13:19:57 +0000 (15:19 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 3 Apr 2015 13:19:57 +0000 (15:19 +0200)
commitbe327f62b48f0b7cf15fe225012add3a296f817a
tree548c9f7f571f4d57124c23c565bc42f08c2461ed
parent66735cc91ab11711659b5a8b0dd40dcf5153bd3a
parent15748f41bf408b6ea4a63ee43d73ff318bc141b1
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/helptools/data/pages/homepage-en_US.html

Change-Id: I599ff62cb723e09d091683435dc1ab97c2266f60
scilab/bin/scilab
scilab/modules/atoms/tests/unit_tests/atomsIsLoaded.tst
scilab/modules/atoms/tests/unit_tests/atomsRemoveList.tst
scilab/modules/helptools/data/pages/homepage-en_US.html