Merge remote-tracking branch 'origin/master' into graphic 93/5393/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Mon, 14 Nov 2011 11:50:21 +0000 (12:50 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Mon, 14 Nov 2011 11:50:21 +0000 (12:50 +0100)
commit8ab8ae437e1b58c7da579815bb167a56d524103e
tree4ae1083f27fd2aa2256b62d3959393cbf0d69d51
parentb24e852983307e8bb3593620f15d284d54bbfae7
parentd396656b9e072497d69544946fc8c1a06ebf14e9
Merge remote-tracking branch 'origin/master' into graphic

Conflicts:
scilab/Version.incl
scilab/configure
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/messagebox/ScilabModalDialog.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/BarUpdater.java
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.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/listener/PaletteManagerMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java

Change-Id: I79089779efcecaf28b71bd74c811ba112e62338a
24 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
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/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/BarUpdater.java
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
scilab/modules/xcos/Makefile.in
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/listener/PaletteManagerMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java
scilab/modules/xml/Makefile.in