summaryrefslogtreecommitdiffstats
path: root/scilab/Version.incl
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab.org>2011-10-21 14:39:58 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2011-10-21 14:39:58 +0200
commit64ae08109670d34f40c9f26ecb1e2252e042527f (patch)
tree9c3a7243d6cf91e7baa995003f7feee1bc6b2f57 /scilab/Version.incl
parent72b13c395184709de44a8bc4a4b024581967e960 (diff)
parent766db40e35641b56fee404a53fce86a69f857d05 (diff)
downloadscilab-64ae08109670d34f40c9f26ecb1e2252e042527f.zip
scilab-64ae08109670d34f40c9f26ecb1e2252e042527f.tar.gz
Merge remote-tracking branch 'origin/master' into graphic
Conflicts: scilab/CHANGES_5.4.X scilab/Version.incl scilab/configure scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java scilab/modules/gui/Makefile.in scilab/modules/gui/src/c/gui.vcxproj scilab/modules/gui/src/c/gui.vcxproj.filters scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.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/window/SwingScilabWindow.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/tab/ScilabTab.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTabBridge.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/SimpleTab.java scilab/modules/gui/src/java/org/scilab/modules/gui/tab/Tab.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/BarUpdater.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciDockingListener.java scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciUndockingAction.java scilab/modules/gui/src/jni/CallScilabBridge.giws.xml 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/scinotes/src/java/org/scilab/modules/scinotes/actions/ExitAction.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SearchFile.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/ScilabVariableBrowser.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/variablebrowser/VariableBrowser.java scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java Change-Id: I8091c22f13fef9955c76864f8d17d6680af0abe8
Diffstat (limited to 'scilab/Version.incl')
-rw-r--r--scilab/Version.incl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scilab/Version.incl b/scilab/Version.incl
index 5772267..ac7e383 100644
--- a/scilab/Version.incl
+++ b/scilab/Version.incl
@@ -1 +1 @@
SCIVERSION=Scilab-Branch-uicontrol-GIT SCIVERSION=Scilab-Branch-graphic-GIT