Merge remote-tracking branch 'origin/master' into YaSp 20/8420/2
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 30 Jul 2012 15:14:30 +0000 (17:14 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 30 Jul 2012 16:04:45 +0000 (18:04 +0200)
commit2288e7ed7889a6175b95454b7a9a602ea182e353
tree46157e5d2cbf951df97e2f0ac4c36fa8c8e20b14
parent1a1f6a111734f2f855d62defc1ba81887e84ba20
parentf31e90a0328154d4cc95675d8c1dcab429b71802
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/configure
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/fileio/macros/listfiles.sci

Change-Id: Iebf4e893e38dbbdaa4bcbee2410b3c88682561be
23 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/stack-c.h
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/external_objects.iss
scilab/modules/fftw/sci_gateway/c/sci_fftw.c
scilab/modules/renderer/renderer.iss
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/threads/Makefile.am
scilab/modules/threads/Makefile.in