Merge remote-tracking branch 'origin/master' into MPI 84/11984/1
Cedric Delamarre [Tue, 9 Jul 2013 09:04:40 +0000 (11:04 +0200)]
Change-Id: I9049a67287d944ee7aa14b5f985ac0bc95c7a285

15 files changed:
1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/modules/console/src/c/others/mainscic.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/xcos/Makefile.in

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge