Merge remote-tracking branch 'origin/master' into YaSp 84/10884/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 19 Mar 2013 10:56:09 +0000 (11:56 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Tue, 19 Mar 2013 10:56:09 +0000 (11:56 +0100)
commit0e00cf2fe2724c9720f9907cf8c2ed7c684d2a03
tree462f6ef4a918e1267d1157f95d49fbb475310049
parentf859b22b85712103978cd2bcacb1e39b9903aa44
parentd750c4a308914b95094ba8e08c52ca6964a6438e
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/completion/src/c/completeLine.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/intersci/src/exe/intersci-n.h
scilab/modules/intersci/src/exe/intersci.h
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcxproj.filters

Change-Id: I08138b48821b5668c8896e22f7dca7a0337799fa
14 files changed:
scilab/configure
scilab/configure.ac
scilab/modules/completion/src/c/completeLine.c
scilab/modules/core/includes/loadversion.h
scilab/modules/core/src/c/stack2.c
scilab/modules/renderer/renderer.iss
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chinfo.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luinfo.c