Merge remote-tracking branch 'origin/5.5' 00/16300/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 31 Mar 2015 15:24:55 +0000 (17:24 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 31 Mar 2015 15:24:55 +0000 (17:24 +0200)
commit22c40dc99526e82339e6dad9a9cfed759c1d2d58
treef0659b11ca6ec9eba7ad07ef35f4f7d70ec8b2c0
parent9b2068e64fdf517f451d71277f4aace8897204b4
parentfecb7c4cf24d8bf96d73a79e3f987ddfde4b4259
Merge remote-tracking branch 'origin/5.5'

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

Change-Id: Ic8def18086adf1d39ea1edc1c997ec3526f772a3
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html