Merge remote-tracking branch 'origin/master' into graphic 49/5949/1
authorVincent COUVERT <vincent.couvert@scilab.org>
Tue, 17 Jan 2012 08:53:33 +0000 (09:53 +0100)
committerVincent COUVERT <vincent.couvert@scilab.org>
Tue, 17 Jan 2012 08:53:33 +0000 (09:53 +0100)
commit1c1399f6dfaa9863048a64b4873205456d05f392
tree7438932a9a97322efa2dd2cf1fe120e5838d6d7d
parentef91bd827e34f3c6a7d8bd1f1b231375a77b9877
parentd5a35f810b9d4c562555b6a793aacd73f11ea67e
Merge remote-tracking branch 'origin/master' into graphic

Conflicts:
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/graphics/locales/ja_JP.po
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/libscilab-cli/Makefile.in

Change-Id: I31e96def56304175f2a46d715881968af29ce41b
27 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/java/org/scilab/modules/core/ConsoleTab.java
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistory.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/types/Makefile.in
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/filebrowser/SwingScilabFileBrowser.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/scilab-lib.properties.vc