Merge remote-tracking branch 'origin/master' into YaSp 72/16572/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 2 Jun 2015 08:33:59 +0000 (10:33 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Tue, 2 Jun 2015 08:33:59 +0000 (10:33 +0200)
commit902c51e7b1830b21951e1257a93bc86d8bab23d2
tree85af1e09ab523304ee558ed86b98af72c9e7fc6e
parent2847e79405ed57536adb25f91b8cd21b255fc543
parentdd7b44fa509af0701a686045027a455f44eb659b
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/fftw/src/c/fftw_utilities.c
scilab/modules/overloading/macros/%hm_prod.sci
scilab/modules/overloading/macros/%hm_sum.sci

Change-Id: I82b54e5c917e07e8637b561ddec9949fd0bcb038
scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java