Merge remote-tracking branch 'origin/master' into yasp 55/11355/2
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 22 Apr 2013 10:16:12 +0000 (12:16 +0200)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Mon, 22 Apr 2013 13:07:14 +0000 (15:07 +0200)
commitb602e0b21101ee6d41f95efb0803a35040f092ad
treeb38e8670030944db8857eb2881f8c5a2fa847683
parenta413f171da6b408958f238e6ccc2a8bf306d19d5
parentc541f56f44b1eaa00155a7c4b696fa1f8cca6736
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/scicos/src/c/scicos.c
scilab/modules/spreadsheet/includes/gw_spreadsheet.h
scilab/modules/spreadsheet/sci_gateway/c/gw_spreadsheet.c
scilab/modules/spreadsheet/sci_gateway/spreadsheet_gateway.xml
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/csvWrite.c
scilab/modules/spreadsheet/src/c/csv_strsubst.c
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/string/sci_gateway/c/sci_isnum.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp

Change-Id: I0857f9853d8c4699f4fa4bc8a33a65a332bc6baf
44 files changed:
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/modules/arnoldi/sci_gateway/c/sci_dnaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dneupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dsaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dseupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/ast/src/cpp/visitor_common.cpp
scilab/modules/boolean/sci_gateway/cpp/sci_find.cpp
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/src/c/scicos.c
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/includes/gw_spreadsheet.h
scilab/modules/spreadsheet/sci_gateway/c/gw_spreadsheet.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvStringToDouble.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/spreadsheet/sci_gateway/spreadsheet_gateway.xml
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/csvWrite.c
scilab/modules/spreadsheet/src/c/getRange.c
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/stringToComplex.h
scilab/modules/string/includes/stringToDouble.h
scilab/modules/string/includes/string_gw.hxx
scilab/modules/string/includes/strsubst.h
scilab/modules/string/sci_gateway/cpp/sci_isnum.cpp
scilab/modules/string/sci_gateway/cpp/sci_strsubst.cpp
scilab/modules/string/sci_gateway/cpp/string_gw.cpp
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj.filters
scilab/modules/string/src/c/isnum.c
scilab/modules/string/src/c/isnum.h
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/stringToComplex.c
scilab/modules/string/src/c/stringToDouble.c
scilab/modules/string/src/c/strsubst.c
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp