Merge remote-tracking branch 'origin/5.5' 84/16184/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 19 Mar 2015 10:02:12 +0000 (11:02 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 19 Mar 2015 10:02:12 +0000 (11:02 +0100)
commite032bc01d52785bfd9952f21ef937cbf1315926e
tree479a0ee8d98f8cb3256274ddfe4ff3eed2b6d127
parenta337d144271aa0fc3737071de9dfea3c8fbcc8dc
parent1d71598acf7e26e9fca80f72ca0cb0ec37311094
Merge remote-tracking branch 'origin/5.5'

Conflicts:
scilab/configure

Change-Id: I339b16ae0ecccdebb7e90612c1920adfce7b77cd
scilab/configure
scilab/modules/core/includes/machine.h.in