Merge remote-tracking branch 'origin/master' into YaSp 70/15470/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 4 Nov 2014 13:35:07 +0000 (14:35 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 4 Nov 2014 13:35:07 +0000 (14:35 +0100)
commit8d3c2217490d1ce01703c2028b5f3ea5d16a189b
tree6313802526534e4fb35456f94c4622748c7ba3ff
parent8c75a3f2fa859181489ddcd255434177f502d392
parent598fa419e890ac8fb69248b00d845f3e4f326bab
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/core/src/fortran/inisci.f
scilab/modules/javasci/Makefile.in
scilab/modules/polynomials/sci_gateway/fortran/sci_f_bezout.f

Change-Id: I67f2e75a70e0c2a48b325f3b817f0a1581dbaedd
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/scilab
scilab/configure
scilab/modules/javasci/Makefile.in