Merge remote-tracking branch 'origin/master' into JIMS 44/12244/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 8 Aug 2013 10:14:19 +0000 (12:14 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 8 Aug 2013 10:14:19 +0000 (12:14 +0200)
commit7c1f782e1a5907875a8aeebfc363b126e9febdfe
tree17d0d41a07f28c3cee88fa14ecc3c34642381569
parent5fee85e329e52b954a3337de40aed459caa3dce9
parentd25fba5ecbef4874cdf47f699f1aea1c0e8c2a12
Merge remote-tracking branch 'origin/master' into JIMS

Conflicts:
scilab/etc/classpath.xml.vc

Change-Id: Ia914b51e005f055132f21d4ae29268d9a3d267d6
scilab/CHANGES_5.5.X
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/core/src/c/stack2.c
scilab/scilab-lib.properties.vc