Merge remote-tracking branch 'origin/5.5' 58/14858/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 15:11:17 +0000 (17:11 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 15:11:17 +0000 (17:11 +0200)
commit01768bc95781b68859d872ff9f3ac9105e7cc116
tree4ea3c3270eb8058ee6e9a77d9182266168450d65
parentafe150ae2756eef80000b519de439b6a7d562757
parentd1de66a409648e4a3c4ec594d68138505c9a1d22
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/configure

Change-Id: I6cd23891c2e2c317ff5d8efb7146893e841814b4
scilab/configure
scilab/configure.ac
scilab/modules/javasci/Makefile.in