Merge remote-tracking branch 'origin/5.5' 24/15124/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 28 Aug 2014 15:31:58 +0000 (17:31 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 28 Aug 2014 15:31:58 +0000 (17:31 +0200)
commitd8c7170d1d341530e5d6916409041ef13a6ab37b
treea0a68e73626728934f32db36466e14a09f8a7c82
parent86427d492655e005c7b9cf98cf18cbe2ff863976
parentc0bc7a4e57a6d6a3c926502249e6be2cdfb11167
Merge remote-tracking branch 'origin/5.5'

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

Change-Id: I03db64455e82edd715a78e4465510f6ef0745968
scilab/configure
scilab/configure.ac
scilab/modules/helptools/data/pages/homepage-ru_RU.html