Merge desktop into master

Change-Id: Id648b8fd660276ae2a70fe2bbf291a0109d5a175

diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index e2f9762..02f77e2 100644 (file)
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -28,7 +28,7 @@ The option is "disableUnderMode" and can be:
 <classpaths>
 
 <!-- Mandatory on startup -->
-<path value="$SCILAB/thirdparty/flexdock-0.5.3.jar"/>
+<path value="$SCILAB/thirdparty/flexdock-0.5.4.jar"/>
 <path value="$SCILAB/thirdparty/jrosetta-API.jar" disableUnderMode="NW"/>
 <path value="$SCILAB/thirdparty/jrosetta-engine.jar"/>
 <path value="$SCILAB/thirdparty/skinlf.jar"/>

diff --git a/scilab/modules/core/includes/version.h.in b/scilab/modules/core/includes/version.h.in
index eadf886..61214f8 100644 (file)
--- a/scilab/modules/core/includes/version.h.in
+++ b/scilab/modules/core/includes/version.h.in
@@ -15,7 +15,7 @@
 #define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@
 #define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@
 #define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@
-#define SCI_VERSION_STRING "scilab-branch-desktop"
+#define SCI_VERSION_STRING "scilab-branch-master"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -25,7 +25,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-desktop"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 
 #endif

diff --git a/scilab/modules/core/includes/version.h.vc b/scilab/modules/core/includes/version.h.vc
index 03b8474..88d0cbd 100644 (file)
--- a/scilab/modules/core/includes/version.h.vc
+++ b/scilab/modules/core/includes/version.h.vc
@@ -15,7 +15,7 @@
 #define SCI_VERSION_MAJOR 5
 #define SCI_VERSION_MINOR 4
 #define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-desktop"
+#define SCI_VERSION_STRING "scilab-branch-master"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -25,7 +25,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-desktop"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 
 #endif

diff --git a/scilab/modules/gui/gui.iss b/scilab/modules/gui/gui.iss
index 0e787f5..7b6e9bb 100644 (file)
--- a/scilab/modules/gui/gui.iss
+++ b/scilab/modules/gui/gui.iss
@@ -24,7 +24,7 @@ Source: bin\no{#GUI}.dll; DestDir: {app}\bin; DestName: sci{#GUI}.dll; Component
 
 Source: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: thirdparty\flexdock-0.5.2.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\flexdock-0.5.4.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\commons-logging-1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\looks-2.1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: thirdparty\skinlf.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}

diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 671c1d5..77b7212 100644 (file)
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -2,7 +2,7 @@
 
 commons-logging.jar=${thirdparty.dir}/commons-logging-1.1.jar
 
-flexdock.jar=${thirdparty.dir}/flexdock-0.5.3.jar
+flexdock.jar=${thirdparty.dir}/flexdock-0.5.4.jar
 
 jgraphx.jar=${thirdparty.dir}/jgraphx.jar