Rename branch after merge 54/6954/1
Vincent COUVERT [Thu, 12 Apr 2012 12:59:15 +0000 (14:59 +0200)]
Change-Id: I169416967eec43b2f3735ab1814f0a926456dae9

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

index ac7e383..d66dd00 100644 (file)
@@ -1 +1 @@
-SCIVERSION=Scilab-Branch-graphic-GIT
+SCIVERSION=Scilab-Branch-master-GIT
index 0cba404..61214f8 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-graphic"
+#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-graphic"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 
 #endif
index d6aa3db..88d0cbd 100644 (file)
@@ -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-graphic"
+#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-graphic"
+#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
 
 
 #endif