Change version name according to branch name 34/9334/1
Vincent COUVERT [Mon, 1 Oct 2012 13:30:21 +0000 (15:30 +0200)]
Change-Id: I7ee13df95d9a04c75c89c69bd36f5c7d8d8705bf

scilab/Version.incl
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc

index d66dd00..be24aaf 100644 (file)
@@ -1 +1 @@
-SCIVERSION=Scilab-Branch-master-GIT
+SCIVERSION=Scilab-Branch-5.4-GIT
index 61214f8..d8d98a0 100644 (file)
@@ -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-master"
+#define SCI_VERSION_STRING "scilab-branch-5.4"
 /* 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-master"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-5.4"
 
 
 #endif
index 88d0cbd..68b0738 100644 (file)
@@ -14,8 +14,8 @@
 
 #define SCI_VERSION_MAJOR 5
 #define SCI_VERSION_MINOR 4
-#define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-master"
+#define SCI_VERSION_MAINTENANCE 1
+#define SCI_VERSION_STRING "scilab-branch-5.4"
 /* 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-master"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-5.4"
 
 
 #endif