Merge remote-tracking branch 'origin/master' into MPI 51/12451/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 6 Sep 2013 10:07:47 +0000 (12:07 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 6 Sep 2013 10:07:51 +0000 (12:07 +0200)
commit2bf53a935f9e7510d22b1c0e814fdd6ba5ad3982
tree3907b13190f455c2c695f47cc3331bd03f176727
parentb04524e31b01dc13fcf0e3fa0503de57efece624
parent9eea9e34eebc04c56ed8e0f36e023bc684b3b8f0
Merge remote-tracking branch 'origin/master' into MPI

Conflicts:
scilab/Makefile.in
scilab/configure

Change-Id: I94fdde067f7e5b0492e5d585750a0e8e465cf533
scilab/Makefile.am
scilab/Makefile.in
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/modules/completion/Makefile.in
scilab/modules/external_objects/Makefile.in