Merge remote-tracking branch 'origin/master' into YaSp 86/16186/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 19 Mar 2015 10:30:01 +0000 (11:30 +0100)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 19 Mar 2015 10:30:01 +0000 (11:30 +0100)
commit45da0b757d5a3a9d94ee02202d987ada6b56dd36
treeae1bb1bdff6eb6387af303d168b7ff321e3b6570
parentaa1aa6ff4f5fbf611eb67a36421a754fea2c77c2
parente032bc01d52785bfd9952f21ef937cbf1315926e
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/scicos/Makefile.in

Change-Id: I5dc42a5088968c2e3f269904a2f18c542978da0a
12 files changed:
scilab/configure
scilab/contrib/Makefile.am
scilab/contrib/Makefile.in
scilab/contrib/toolbox_skeleton.iss
scilab/modules/core/includes/machine.h.in
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/signal_processing/macros/wfir_gui.sci