Merge remote-tracking branch 'origin/master' into MPI 50/12450/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 6 Sep 2013 09:34:04 +0000 (11:34 +0200)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 6 Sep 2013 09:34:04 +0000 (11:34 +0200)
commitb04524e31b01dc13fcf0e3fa0503de57efece624
treebde7ce6d0183d3c0491a61913a83d246998472c9
parentcf06e60edda83acce4d5036a28bb775e45bf289f
parentf8e2529889001121a50f1cfa2e4cb3a925b0daa9
Merge remote-tracking branch 'origin/master' into MPI

Conflicts:
scilab/Makefile.in
scilab/configure
scilab/modules/Makefile.in
scilab/modules/console/src/c/others/mainscic.cpp
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c

Change-Id: I5918d1c09c2c948142b09133ed0963d6ca80ee8e
15 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/src/c/others/mainscic.cpp
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/external_objects/Makefile.in
scilab/modules/helptools/etc/MAIN_CHAPTERS