Merge remote-tracking branch 'origin/master' into YaSp 25/10825/1
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 14 Mar 2013 13:38:20 +0000 (14:38 +0100)
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>
Thu, 14 Mar 2013 13:38:20 +0000 (14:38 +0100)
commit3f91b0a2914da6f325efc883061e74aa30ca2c4f
tree47516de672e26a15999804da7d0671ef72b8249c
parent99a1f71745019e9a1923cbf387d1cf04d45b29d5
parent44b9856d7ec9b2690de0c5e4359861255ccb32d3
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/modules/Makefile.am
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/src/c/stack1.c
scilab/modules/differential_equations/sci_gateway/fortran/bjac.f
scilab/modules/differential_equations/sci_gateway/fortran/bjacd.f
scilab/modules/differential_equations/sci_gateway/fortran/bresd.f
scilab/modules/differential_equations/sci_gateway/fortran/bsurfd.f
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/functions/macros/genlib.sci
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/parallel/Makefile.am
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/src/c/getRange.c
scilab/modules/spreadsheet/src/c/latintoutf.c
scilab/modules/string/sci_gateway/c/sci_strtod.c

Change-Id: I6539cb08611dd355719768071a539a195585049a
23 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/bin/bin.iss
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/src/c/stack1.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/differential_equations/tests/unit_tests/dae.tst
scilab/modules/helptools/src/java/org/scilab/modules/helptools/image/ScilabImageConverter.java
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/parallel/Makefile.am
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/spreadsheet/src/c/csvDefault.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/spreadsheet/src/c/csvWrite.c
scilab/modules/spreadsheet/src/c/getRange.c
scilab/modules/spreadsheet/src/c/stringToComplex.c
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in