Merge remote-tracking branch 'refs/remotes/origin/master' into desktop 81/5181/1
authorAllan CORNET <allan.cornet@scilab.org>
Mon, 10 Oct 2011 06:56:02 +0000 (08:56 +0200)
committerAllan CORNET <allan.cornet@scilab.org>
Mon, 10 Oct 2011 07:45:59 +0000 (09:45 +0200)
commit0785f27ee52c2876bd3649a1924a103c39bf0279
tree549bfe302295f5a4224b86bc7852cb3414e9d46b
parent5eeaf92f7b6261ead279ed5c74afaa529b7b337e
parentf844266d865a78e0fd87af233e2dd5fca5af1dcd
Merge remote-tracking branch 'refs/remotes/origin/master' into desktop

Conflicts:
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/EditorComponent.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/libjvm_Import.def
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/jni/BrowseVar.cpp
scilab/modules/ui_data/src/jni/BrowseVar.hxx

Change-Id: If49d095ac9a8767f1411830db1096be231aeb52c
42 files changed:
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/etc/librarypath.xml
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/console/src/c/fileio_Import.def
scilab/modules/console/src/c/ui_data_Import.def
scilab/modules/console/src/java/org/scilab/modules/console/SciInputCommandView.java
scilab/modules/console/src/java/org/scilab/modules/console/SciOutputView.java
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/gui/Makefile.am
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/helpbrowser/SwingScilabHelpBrowserViewer.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/scinotes/src/jflex/scilab.jflex
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj
scilab/modules/ui_data/src/jni/BrowseVar.cpp
scilab/modules/ui_data/src/jni/BrowseVar.hxx
scilab/modules/ui_data/src/jni/FileBrowser.cpp
scilab/modules/ui_data/src/jni/FileBrowser.hxx
scilab/scilab-lib.properties.vc