From ec21624aeb5c1addf29a4a0de77f169d57abc479 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 14 Apr 2020 09:30:04 +0200 Subject: [PATCH] updated git versions --- 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 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 523475379..3e9678ab7 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: b0fd4f4c44ac378744e724cce684aca4a56fe0fc -Revision: 536 -Branch: 4.1.1 +Repsitory UUID: 1de5b85ce2f40a83dae99272160d6574bb7e788e +Revision: 538 +Branch: 4.2.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4153 -Last Changed Date: 2020-01-14 15:47:24.000000001 +0100 ./src/qTabSettings.cpp +Last Changed Rev: 4175 +Last Changed Date: 2020-04-14 09:09:45.535926413 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 6c768c91d..de164f14f 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 "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" +#define GITREPUUID "1de5b85ce2f40a83dae99272160d6574bb7e788e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4153 -#define GITDATE 0x20200114 -#define GITBRANCH "4.1.1" +#define GITREV 0x4175 +#define GITDATE 0x20200414 +#define GITBRANCH "4.2.0" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index ebfdd2b47..0453bddf9 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: b0fd4f4c44ac378744e724cce684aca4a56fe0fc -Revision: 2101 -Branch: 4.1.1 +Repsitory UUID: 1de5b85ce2f40a83dae99272160d6574bb7e788e +Revision: 2112 +Branch: 4.2.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4153 -Last Changed Date: 2020-01-14 16:16:00.000000001 +0100 ./threadFiles/ThreadPool.o +Last Changed Rev: 4175 +Last Changed Date: 2020-04-14 09:18:10.968379834 +0200 ./sharedMemory/SharedMemory.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 6c768c91d..de164f14f 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 "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" +#define GITREPUUID "1de5b85ce2f40a83dae99272160d6574bb7e788e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4153 -#define GITDATE 0x20200114 -#define GITBRANCH "4.1.1" +#define GITREV 0x4175 +#define GITDATE 0x20200414 +#define GITBRANCH "4.2.0" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 72a40397d..c148a2b4f 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: b0fd4f4c44ac378744e724cce684aca4a56fe0fc -Revision: 872 -Branch: 4.1.1 +Repsitory UUID: 1de5b85ce2f40a83dae99272160d6574bb7e788e +Revision: 877 +Branch: 4.2.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4153 -Last Changed Date: 2020-01-14 15:47:26.000000001 +0100 ./updateAPIVersion.sh +Last Changed Rev: 4175 +Last Changed Date: 2020-04-14 09:09:45.600925574 +0200 ./updateAPIVersion.sh diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 6c768c91d..de164f14f 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 "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" +#define GITREPUUID "1de5b85ce2f40a83dae99272160d6574bb7e788e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4153 -#define GITDATE 0x20200114 -#define GITBRANCH "4.1.1" +#define GITREV 0x4175 +#define GITDATE 0x20200414 +#define GITBRANCH "4.2.0"