From 912e4f28ed00a77ba0c57f383375ac9a2681dbd9 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 30 May 2014 18:02:29 +0200
Subject: [PATCH] make version v6-00-00.
---
build/version_number | 2 +-
core/base/inc/RVersion.h | 10 ++++----
rootx/src/rootcoreteam.h | 53 +++++++++++++++++++---------------------
3 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/build/version_number b/build/version_number
index a2f55388906..b56ba120839 100644
--- a/build/version_number
+++ b/build/version_number
@@ -1 +1 @@
-5.99/06
+6.00/00
diff --git a/core/base/inc/RVersion.h b/core/base/inc/RVersion.h
index 310a78f9171..7c7316f08a1 100644
--- a/core/base/inc/RVersion.h
+++ b/core/base/inc/RVersion.h
@@ -14,12 +14,12 @@
*
*/
-#define ROOT_RELEASE "5.99/06"
-#define ROOT_RELEASE_DATE "Apr 3 2014"
-#define ROOT_RELEASE_TIME "23:20:15"
-#define ROOT_GIT_COMMIT "v5-99-05-lhcb-415-gf256d69"
+#define ROOT_RELEASE "6.00/00"
+#define ROOT_RELEASE_DATE "May 30 2014"
+#define ROOT_RELEASE_TIME "15:37:17"
+#define ROOT_GIT_COMMIT "v5-99-06-967-gdd4636e"
#define ROOT_GIT_BRANCH "heads/master"
-#define ROOT_VERSION_CODE 353030
+#define ROOT_VERSION_CODE 393216
#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif
diff --git a/rootx/src/rootcoreteam.h b/rootx/src/rootcoreteam.h
index d3fabf3bc14..239edf1ef26 100644
--- a/rootx/src/rootcoreteam.h
+++ b/rootx/src/rootcoreteam.h
@@ -4,40 +4,37 @@
namespace ROOT {
namespace ROOTX {
-//This array will be updated by external script, reading names from http://root.cern.ch/gitstats/authors.html.
-//The names are sorted in an alphabetical order.
-//Please note the structure: it should always like this - names as
+//This file is automatically generated with names from http://root.cern.ch/gitstats/authors.html.
+//The names are sorted in an alphabetical order (sorted by a family name).
+//Please note the structure: it should be always like this - names as
//string literals in an array's initializer
-//with a terminating 0 - that's what our rootxx.cxx and rootx-cocoa.mm expect!!!
+//with a terminating 0 - that's what our rootxx.cxx and rootx-cocoa.mm expect.
//The array (or its elements actually) has an internal linkage
//(it has a definition here, not in rootxx.cxx or rootx-cocoa.mm files.
-//So this header can be included in different places (as soon as you know what you're doing).
//Please, do not modify this file.
const char * gROOTCoreTeam[] = {
-//[STRINGTOREPLACE
-"Ilka Antcheva",
-"Bertrand Bellenot",
-"Rene Brun",
-"Philippe Canal",
-"Olivier Couet",
-"Cristina Cristescu",
-"Gerardo Ganis",
-"Andrei Gheata",
-"Wim Lavrijsen",
-"Pere Mato",
-"Lorenzo Moneta",
-"Axel Naumann",
-"Valeri Onuchin",
-"Danilo Piparo",
-"Timur Pocheptsov",
-"Fons Rademakers",
-"Paul Russo",
-"Matevz Tadel",
-"Vassil Vassilev",
-"Wouter Verkerke",
-0};
-//STRINGTOREPLACE]
+ "Ilka Antcheva",
+ "Bertrand Bellenot",
+ "Rene Brun",
+ "Philippe Canal",
+ "Olivier Couet",
+ "Cristina Cristescu",
+ "Gerardo Ganis",
+ "Andrei Gheata",
+ "Wim Lavrijsen",
+ "Pere Mato",
+ "Lorenzo Moneta",
+ "Axel Naumann",
+ "Valeri Onuchine",
+ "Danilo Piparo",
+ "Timur Pocheptsov",
+ "Fons Rademakers",
+ "Paul Russo",
+ "Matevz Tadel",
+ "Vassil Vassilev",
+ "Wouter Verkerke",
+ 0};
}
}
--
GitLab