Merge remote-tracking branch 'origin/master' into yasp 95/10295/1
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 24 Jan 2013 16:36:12 +0000 (17:36 +0100)
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>
Thu, 24 Jan 2013 16:43:56 +0000 (17:43 +0100)
commita3f262b899acce2e4f190efd646d41b54b780cca
treecc13ea583c1c9c083a4c600b47a111d99b80cd72
parent50f9d8562a957bf7c7223b875c8eb1416053854e
parentbe09019c8640260dc2005d3a05148ee8f8629213
Merge remote-tracking branch 'origin/master' into yasp

Conflicts:
scilab/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/atoms/atoms.iss
scilab/modules/cacsd/cacsd.iss
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/external_objects/external_objects.iss
scilab/modules/interpolation/interpolation.iss
scilab/modules/intersci/intersci.iss
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/m2sci/m2sci.iss
scilab/modules/matio/matio.iss
scilab/modules/mexlib/mexlib.iss
scilab/modules/optimization/optimization.iss
scilab/modules/parallel/parallel.iss
scilab/modules/polynomials/polynomials.iss
scilab/modules/randlib/randlib.iss
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/sound/sound.iss
scilab/modules/sparse/sparse.iss
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/statistics.iss
scilab/modules/symbolic/symbolic.iss
scilab/modules/umfpack/umfpack.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/icons.iss

Change-Id: I153a9e4863d429281bfd5d575a9f9a247749cdaf
53 files changed:
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/atoms/atoms.iss
scilab/modules/cacsd/cacsd.iss
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/commons.iss
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/compatibility_functions/etc/compatibility_functions.start
scilab/modules/console/console.iss
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj.filters
scilab/modules/core/etc/core.start
scilab/modules/core/macros/intppty.sci
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/external_objects/external_objects.iss
scilab/modules/external_objects/macros/!_deff_wrapper.sci
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/gui/gui.iss
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/gui/src/nogui/nogui.vcxproj.filters
scilab/modules/interpolation/interpolation.iss
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj.filters
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/m2sci/m2sci.iss
scilab/modules/matio/matio.iss
scilab/modules/mexlib/mexlib.iss
scilab/modules/optimization/optimization.iss
scilab/modules/parallel/parallel.iss
scilab/modules/polynomials/polynomials.iss
scilab/modules/randlib/randlib.iss
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/sound/sound.iss
scilab/modules/sparse/sparse.iss
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/statistics.iss
scilab/modules/symbolic/symbolic.iss
scilab/modules/types/types.iss
scilab/modules/umfpack/umfpack.iss
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss
scilab/tools/innosetup/icons.iss
scilab/tools/innosetup/types.iss