diff options
| author | Bruno JOFRET <bruno.jofret@scilab-enterprises.com> | 2012-01-13 08:22:26 +0100 |
|---|---|---|
| committer | Allan CORNET <allan.cornet@scilab.org> | 2012-01-16 11:21:42 +0100 |
| commit | 158ded1146180e37230e2ef13092071bd4c87562 (patch) | |
| tree | 987bc0f46731aa6f4d06e99e85a170437cfbaec8 /scilab/modules | |
| parent | 94f30dbc65765baf3cd6bfdb46004a5b18652858 (diff) | |
| parent | 84760bd6477062829ce71f86949644912bfc0f5e (diff) | |
| download | scilab-158ded1146180e37230e2ef13092071bd4c87562.zip scilab-158ded1146180e37230e2ef13092071bd4c87562.tar.gz | |
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/DetectFrameWork2/DetectFramework.vcxproj.filters
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/libst.rc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_lasterror.c
scilab/modules/core/src/c/banier.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/fortran/fact.f
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/src/c/convertbase.h
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/macros/fullfile.sci
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fullpath.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_mputl.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/src/c/mget.c
scilab/modules/fileio/src/c/mopen.c
scilab/modules/functions/sci_gateway/c/sci_whereis.c
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/gui.iss
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/includes/gw_helptools.h
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/sci_gateway/helptools_gateway.xml
scilab/modules/history_manager/sci_gateway/c/sci_saveafterncommands.c
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/history_manager/src/c/getCommentDateSession.h
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.in
scilab/modules/intersci/src/exe/intersci-n.c
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/tests/unit_tests/bdiag.dia.ref
scilab/modules/linear_algebra/tests/unit_tests/bdiag.tst
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/maple2scilab/Makefile.in
scilab/modules/maple2scilab/maple2scilab.iss
scilab/modules/mexlib/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/java/output_stream-JAVA.vcxproj
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/prebuildjava/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/sci_gateway/signal_processing_gateway.xml
scilab/modules/signal_processing/src/c/Libscilab_Import.def
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/special_functions/src/c/LibScilab_Import.def
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/types.iss
scilab/modules/types/types.vcxproj
scilab/modules/types/types.vcxproj.filters
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c
scilab/modules/ui_data/sci_gateway/cpp/sci_browsevar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/umfpack/src/c/taucs_scilab.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/LibScilab_Import.def
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/sci_gateway/cpp/sci_xmlDelete.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/xml.vcxproj
scilab/scilab-lib.properties.vc
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
Change-Id: If35768ca5ba97e9508c0004f5b0ea8d4fa4e0e9f
Diffstat (limited to 'scilab/modules')
