Merge remote-tracking branch 'origin/master' into YaSp 99/4399/2
authorBruno JOFRET <bruno.jofret@scilab.org>
Tue, 5 Jul 2011 14:46:31 +0000 (16:46 +0200)
committerAntoine ELIAS <antoine.elias@scilab.org>
Tue, 5 Jul 2011 15:28:43 +0000 (17:28 +0200)
commit1c6555bfc3875abb4b6be68031b2ee1caad8ae97
tree92f43e3d82c97c0214d493a55f5db3ac13d1ead2
parent48ba6a17ec0026e389919fd6310b7c9946492ab7
parentbf9a6ee70f49199b1e7aa5c3493597f8b687d58f
Merge remote-tracking branch 'origin/master' into YaSp

Conflicts:
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
scilab/configure
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/dynamic_link/includes/dynamic_link.h
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/mgetl.h
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/history_manager/src/c/LibScilab_Import.def
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/matio/src/c/GetMatlabVariable.c
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/output_stream/src/c/msgstore.c
scilab/modules/scicos/macros/scicos_scicos/c_pass2.sci
scilab/modules/scicos/macros/scicos_scicos/unhilite_modelica_block.sci
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/string/src/c/pcre_private.c
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_warnBlockByUID.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramClose.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramOpen.cpp
scilab/modules/xcos/src/cpp/xcosUtilities.cpp
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java

Change-Id: I40e0afccfd142769af16a71f61657d248864e5f4
140 files changed:
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj.filters
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/src/c/realmain.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/c/stack3.c
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/etc/dynamic_link.start
scilab/modules/dynamic_link/includes/dynamic_link.h
scilab/modules/dynamic_link/sci_gateway/cpp/sci_c_link.cpp
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/mgetl.h
scilab/modules/fileio/sci_gateway/cpp/sci_basename.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_findfiles.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_getlongpathname.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_getshortpathname.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_pathconvert.cpp
scilab/modules/functions/Makefile.in
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_helpbrowser.cpp
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/includes/gw_history_manager.h
scilab/modules/history_manager/sci_gateway/c/sci_historysize.c
scilab/modules/history_manager/sci_gateway/c/sci_loadhistory.c
scilab/modules/history_manager/src/c/LibScilab_Import.def
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/src/c/GetMatlabVariable.c
scilab/modules/matio/src/c/GetStructVariable.c
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/includes/gw_shell.h
scilab/modules/shell/sci_gateway/c/sci_lines.c
scilab/modules/shell/src/c/shell.vcxproj
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/cpp/sci_isletter.cpp
scilab/modules/string/src/c/pcre_private.c
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/src/c/ScilabEval.c
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_warnBlockByUID.cpp
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xcos/src/cpp/xcosUtilities.cpp
scilab/modules/xcos/xcos.iss