Merge remote-tracking branch 'origin/master' into YaSp 77/10577/3
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Fri, 22 Feb 2013 12:13:35 +0000 (13:13 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Fri, 22 Feb 2013 14:05:20 +0000 (15:05 +0100)
commitcec90689d2b8d86f740f8e7129f301fab4bb45e2
tree5c625b23758abf27d3606bf53eefccbc12d25fde
parent640d42a418b778495689e16cfa570b57db1b2682
parent31c6c5a775f2a766ba99e6ec7ce3d3916693d170
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/console/src/c/windows/TermLine.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/getversion.c
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/special_functions/includes/gw_special_functions.h
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/ui_data/includes/gw_ui_data.h
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c

Change-Id: Ie629eb0d79731447c2f2fc223eec2cb49034f5d4
28 files changed:
scilab/modules/arnoldi/includes/gw_arnoldi.h
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_eigs.c
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/console/src/c/windows/TermLine.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/graphic_export/graphic_export.vcxproj.filters
scilab/modules/graphic_export/sci_gateway/c/xs2file.c
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/special_functions/includes/gw_special_functions.h
scilab/modules/string/sci_gateway/cpp/sci_strtod.cpp
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/includes/gw_ui_data.h
scilab/modules/ui_data/sci_gateway/cpp/sci_closeEditvar.cpp
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters