Merge remote-tracking branch 'origin/master' into YaSp 12/15312/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Oct 2014 14:08:59 +0000 (16:08 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Thu, 2 Oct 2014 14:08:59 +0000 (16:08 +0200)
commit5da84ff5b86445963331a653842926a102c884b7
tree59278e092a58b5e7b339f93a74292d9dd020be20
parentae9db4f542f7b25ba5774193b474906a9101e820
parentaa81f021c641981341dd33ae47c8b806e31a0a88
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/integer/src/fortran/i_prod.f
scilab/modules/javasci/Makefile.in

Change-Id: Idd0cc99c0c8e4dca812f9a944e1ab6a63e1e80ca
14 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/aclocal.m4
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/modules/console/src/c/cmdLine/getKey.c
scilab/modules/core/includes/machine.h.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/javasci/Makefile.in
scilab/modules/scicos_blocks/src/c/cscope.c