Merge remote-tracking branch 'origin/5.5' 48/14848/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 07:46:12 +0000 (09:46 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Fri, 11 Jul 2014 07:46:12 +0000 (09:46 +0200)
commitafe150ae2756eef80000b519de439b6a7d562757
tree07336b1294ac0c81001e9effd31c16d14755a9b6
parentf3f297022f0ab6acbdf352150de1d3cb947cc782
parent9c5201528aea37bb0603bf4522467061696752fd
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/CHANGES_5.5.X
scilab/modules/javasci/Makefile.in

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