From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Mon, 6 May 2013 17:39:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=9c1090059ad870d7db07002525dccc980b40819a;hp=47b8a0cb4e49984faa95da2d21c5e2d96fd5bde8

Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit
---

diff --git a/scilab/modules/core/includes/version.h.in b/scilab/modules/core/includes/version.h.in
index 861c06b..220640f 100644
--- a/scilab/modules/core/includes/version.h.in
+++ b/scilab/modules/core/includes/version.h.in
@@ -15,8 +15,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-YaSp"
-#define SCI_VERSION_WIDE_STRING L"scilab-branch-YaSp"
+#define SCI_VERSION_STRING "scilab-branch-richelieu-vmkit"
+#define SCI_VERSION_WIDE_STRING L"scilab-branch-richelieu-vmkit"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -26,7 +26,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-YaSp"
+#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-richelieu-vmkit"
 
 #endif
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/includes/version.h.vc b/scilab/modules/core/includes/version.h.vc
index de4b773..721bc9e 100644
--- a/scilab/modules/core/includes/version.h.vc
+++ b/scilab/modules/core/includes/version.h.vc
@@ -15,8 +15,8 @@
 #define SCI_VERSION_MAJOR 6
 #define SCI_VERSION_MINOR 0
 #define SCI_VERSION_MAINTENANCE 0
-#define SCI_VERSION_STRING "scilab-branch-YaSp"
-#define SCI_VERSION_WIDE_STRING L"scilab-branch-YaSp"
+#define SCI_VERSION_STRING "scilab-branch-richelieu-vmkit"
+#define SCI_VERSION_WIDE_STRING L"scilab-branch-richelieu-vmkit"
 /* SCI_VERSION_REVISION --> hash key commit */
 #define SCI_VERSION_REVISION 0
 #define SCI_VERSION_TIMESTAMP 0
@@ -26,7 +26,7 @@ void disp_scilab_version(void);
 /* for compatibility */
 /* Deprecated */
 #define SCI_VERSION SCI_VERSION_STRING
-#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-YaSp"
+#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-richelieu-vmkit"
 
 #endif
 /*--------------------------------------------------------------------------*/