summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@esi-group.com>2020-03-09 12:19:12 +0100
committerAntoine ELIAS <antoine.elias@esi-group.com>2020-03-18 15:38:24 +0100
commitd7700e3727c294fa4ed6b6940363936bc69df2c0 (patch)
tree93511b703acb59ffc84cc0a2eebf0f61aea9831e
parentf82fcc6cdd15b1e9bd6df6f4c6573020381e1636 (diff)
downloadscilab-d7700e3727c294fa4ed6b6940363936bc69df2c0.zip
scilab-d7700e3727c294fa4ed6b6940363936bc69df2c0.tar.gz
update branch information to 6.1
Change-Id: Ic6b5f9b2e4f2425931f51e44f95da8b9519c431b
-rw-r--r--scilab/Version.incl2
-rw-r--r--scilab/modules/core/includes/version.h.in6
-rw-r--r--scilab/modules/core/includes/version.h.vc6
3 files changed, 7 insertions, 7 deletions
diff --git a/scilab/Version.incl b/scilab/Version.incl
index 35088ac..09d370a 100644
--- a/scilab/Version.incl
+++ b/scilab/Version.incl
@@ -1,2 +1,2 @@
1SCIVERSION=Scilab-Branch-master-GIT 1SCIVERSION=Scilab-Branch-6.1-GIT
2 2
diff --git a/scilab/modules/core/includes/version.h.in b/scilab/modules/core/includes/version.h.in
index 81b3192..60963c6 100644
--- a/scilab/modules/core/includes/version.h.in
+++ b/scilab/modules/core/includes/version.h.in
@@ -18,8 +18,8 @@
18#define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@ 18#define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@
19#define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@ 19#define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@
20#define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@ 20#define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@
21#define SCI_VERSION_STRING "scilab-branch-master" 21#define SCI_VERSION_STRING "scilab-branch-6.1"
22#define SCI_VERSION_WIDE_STRING L"scilab-branch-master" 22#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.1"
23/* SCI_VERSION_REVISION --> hash key commit */ 23/* SCI_VERSION_REVISION --> hash key commit */
24#define SCI_VERSION_REVISION 0 24#define SCI_VERSION_REVISION 0
25#define SCI_VERSION_TIMESTAMP 0 25#define SCI_VERSION_TIMESTAMP 0
@@ -29,7 +29,7 @@ void disp_scilab_version(void);
29/* for compatibility */ 29/* for compatibility */
30/* Deprecated */ 30/* Deprecated */
31#define SCI_VERSION SCI_VERSION_STRING 31#define SCI_VERSION SCI_VERSION_STRING
32#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-master" 32#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-6.1"
33 33
34#endif 34#endif
35/*--------------------------------------------------------------------------*/ 35/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/includes/version.h.vc b/scilab/modules/core/includes/version.h.vc
index 5b97c0d..84d2110 100644
--- a/scilab/modules/core/includes/version.h.vc
+++ b/scilab/modules/core/includes/version.h.vc
@@ -18,8 +18,8 @@
18#define SCI_VERSION_MAJOR 6 18#define SCI_VERSION_MAJOR 6
19#define SCI_VERSION_MINOR 1 19#define SCI_VERSION_MINOR 1
20#define SCI_VERSION_MAINTENANCE 1 20#define SCI_VERSION_MAINTENANCE 1
21#define SCI_VERSION_STRING "scilab-branch-master" 21#define SCI_VERSION_STRING "scilab-branch-6.1"
22#define SCI_VERSION_WIDE_STRING L"scilab-branch-master" 22#define SCI_VERSION_WIDE_STRING L"scilab-branch-6.1"
23/* SCI_VERSION_REVISION --> hash key commit */ 23/* SCI_VERSION_REVISION --> hash key commit */
24#define SCI_VERSION_REVISION 0 24#define SCI_VERSION_REVISION 0
25#define SCI_VERSION_TIMESTAMP 0 25#define SCI_VERSION_TIMESTAMP 0
@@ -29,7 +29,7 @@ void disp_scilab_version(void);
29/* for compatibility */ 29/* for compatibility */
30/* Deprecated */ 30/* Deprecated */
31#define SCI_VERSION SCI_VERSION_STRING 31#define SCI_VERSION SCI_VERSION_STRING
32#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-master" 32#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-6.1"
33 33
34#endif 34#endif
35/*--------------------------------------------------------------------------*/ 35/*--------------------------------------------------------------------------*/