From 588037fd18b805cb7f135f2f5094b8d36279ab53 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 23 Aug 2018 16:23:24 +0200 Subject: [PATCH] updated release version --- RELEASE.txt | 2 +- slsDetectorGui/gitInfo.txt | 10 +++++----- slsDetectorGui/include/gitInfoGui.h | 8 ++++---- slsDetectorSoftware/gitInfo.txt | 10 +++++----- slsDetectorSoftware/slsDetector/gitInfoLib.h | 8 ++++---- slsReceiverSoftware/gitInfo.txt | 10 +++++----- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 0c7cd9b9d..1a7bfa833 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -51,7 +51,7 @@ INTRODUCTION General Software related: dhanya.thattil@psi.ch - anna.bergamaschi@psi.ch + anna.bergamaschi@psi.ch Python related: erik.frojdh@psi.ch diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 2ca43a76e..9d6ecffbd 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 -Revision: 511 -Branch: 3.3.0-rc +Repsitory UUID: e0b8fb36097aaafca033ca755bad4243bca655bc +Revision: 517 +Branch: 4.0.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3941 -Last Changed Date: 2018-07-17 16:15:43.000000002 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 3991 +Last Changed Date: 2018-08-23 11:57:31.000000002 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 40b2a1e3c..eeef3c330 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" +#define GITREPUUID "e0b8fb36097aaafca033ca755bad4243bca655bc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3941 -#define GITDATE 0x20180717 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3991 +#define GITDATE 0x20180823 +#define GITBRANCH "4.0.0" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 5e03ab8bc..727da0a4f 100644 --- a/slsDetectorSoftware/gitInfo.txt +++ b/slsDetectorSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 -Revision: 1992 -Branch: 3.3.0-rc +Repsitory UUID: e0b8fb36097aaafca033ca755bad4243bca655bc +Revision: 2024 +Branch: 4.0.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3941 -Last Changed Date: 2018-07-18 12:26:21.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 3991 +Last Changed Date: 2018-08-23 16:03:28.000000002 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 219fb2199..eeef3c330 100644 --- a/slsDetectorSoftware/slsDetector/gitInfoLib.h +++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" +#define GITREPUUID "e0b8fb36097aaafca033ca755bad4243bca655bc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3941 -#define GITDATE 0x20180718 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3991 +#define GITDATE 0x20180823 +#define GITBRANCH "4.0.0" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 176ad8c05..c71f7218d 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 6bb7195a2c7dc9526088882e0244a7455d3c15b2 -Revision: 809 -Branch: 3.3.0-rc +Repsitory UUID: e0b8fb36097aaafca033ca755bad4243bca655bc +Revision: 831 +Branch: 4.0.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3941 -Last Changed Date: 2018-07-18 12:11:38.000000002 +0200 ./include/HDF5FileStatic.h +Last Changed Rev: 3991 +Last Changed Date: 2018-08-23 11:57:33.000000002 +0200 ./updateAPIVersion.sh diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 219fb2199..eeef3c330 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "6bb7195a2c7dc9526088882e0244a7455d3c15b2" +#define GITREPUUID "e0b8fb36097aaafca033ca755bad4243bca655bc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3941 -#define GITDATE 0x20180718 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3991 +#define GITDATE 0x20180823 +#define GITBRANCH "4.0.0"