Merge remote-tracking branch 'origin/master' into YaSp 72/16572/1
Vincent COUVERT [Tue, 2 Jun 2015 08:33:59 +0000 (10:33 +0200)]
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

1  2 
scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/ScilabJavaCompiler.java