update version name to branch-6.0 00/19000/1
Antoine ELIAS [Mon, 30 Jan 2017 09:30:27 +0000 (10:30 +0100)]
Change-Id: I2dd596b827f2e2fdc3aed8c79adf0d020bf18a1f

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

index 81b3192..494fae2 100644 (file)
@@ -18,8 +18,8 @@
 #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_WIDE_STRING L"scilab-branch-master"
+#define SCI_VERSION_STRING "scilab-branch-6.0"
+#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.0"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -29,7 +29,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-master"
+#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-6.0"
 
 #endif
 /*--------------------------------------------------------------------------*/
index f916a8f..66a02cf 100644 (file)
@@ -18,8 +18,8 @@
 #define SCI_VERSION_MAJOR 6
 #define SCI_VERSION_MINOR 0
 #define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-master"
-#define SCI_VERSION_WIDE_STRING L"scilab-branch-master"
+#define SCI_VERSION_STRING "scilab-branch-6.0"
+#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.0"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -29,7 +29,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-master"
+#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-6.0"
 
 #endif
 /*--------------------------------------------------------------------------*/