Merge remote-tracking branch 'origin/master' into graphic 91/5891/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Thu, 12 Jan 2012 14:52:16 +0000 (15:52 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Thu, 12 Jan 2012 14:52:16 +0000 (15:52 +0100)
commit513f5fc5f649d2d5c05e4e21f61e4a3d4c172213
tree765f843bb1507bda2f2a81b35be6881819ec86d4
parentc61653b5bd94183e9866db7f20485225b0f88fab
parent0ba85a9b8483a32fbb74918e6f00180212742afc
Merge remote-tracking branch 'origin/master' into graphic

Conflicts:
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/ZoomRubberBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/callback/JavaCallBack.java
scilab/modules/gui/src/java/org/scilab/modules/gui/messagebox/ScilabModalDialog.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SearchFile.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/EditVar.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileSelectorComboBox.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileSelectorFilter.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/EditFileWithDefaultAppAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/ScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/VariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SupprAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewViewportAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java

Change-Id: I6b7569f9d2aff78798b1d0e0d96c15e376afeafe
183 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/librarypath.xml
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.am
scilab/modules/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.am
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/java/org/scilab/modules/core/ConsoleTab.java
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
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/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/locales/ja_JP.po
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/help/en_US/unsetmenu.xml
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/ExportOptionWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/ZoomRubberBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/events/callback/JavaCallBack.java
scilab/modules/gui/src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/messagebox/ScilabModalDialog.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
scilab/modules/history_manager/Makefile.in
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/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/libscilab-cli/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/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/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/prebuildjava/build.xml
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SearchFile.java
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/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/ScilabVarFilteringButtonAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/datatable/SwingEditvarTableModel.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileBrowserHistory.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileSelectorComboBox.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/ScilabFileSelectorFilter.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabTreeTable.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/actions/EditFileWithDefaultAppAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/ScilabTabbedPane.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/ScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/VariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CloseAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopySelectionAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopySelectionAsScilabCommandAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopySelectionAsScilabMatrixAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopySelectionAsScilabMatrixWithCRAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateNewVariableAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CreateVariableFromSelectionAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/DuplicateVariableAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertColumnAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/InsertRowAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveColumnAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RemoveRowAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionLongeAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShortAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SetPrecisionShorteAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SizeColumnsToFitAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SupprAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/ViewPortTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteManagerMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java
scilab/modules/xml/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc