diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index b1ca2f795..523475379 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: 38aad40fefaa1bb62785ba2770278cd805765930 -Revision: 535 -Branch: 4.1.1-rc +Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc +Revision: 536 +Branch: 4.1.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4150 -Last Changed Date: 2020-01-06 11:16:42.000000001 +0100 ./src/qTabSettings.cpp +Last Changed Rev: 4153 +Last Changed Date: 2020-01-14 15:47:24.000000001 +0100 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 4bf2a8ca3..6c768c91d 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 "38aad40fefaa1bb62785ba2770278cd805765930" +#define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4150 -#define GITDATE 0x20200106 -#define GITBRANCH "4.1.1-rc" +#define GITREV 0x4153 +#define GITDATE 0x20200114 +#define GITBRANCH "4.1.1" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index ba4f34823..ebfdd2b47 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: 38aad40fefaa1bb62785ba2770278cd805765930 -Revision: 2099 -Branch: 4.1.1-rc +Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc +Revision: 2101 +Branch: 4.1.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4150 -Last Changed Date: 2020-01-06 18:59:33.000000001 +0100 ./threadFiles/ThreadPool.o +Last Changed Rev: 4153 +Last Changed Date: 2020-01-14 16:16:00.000000001 +0100 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 4bf2a8ca3..6c768c91d 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 "38aad40fefaa1bb62785ba2770278cd805765930" +#define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4150 -#define GITDATE 0x20200106 -#define GITBRANCH "4.1.1-rc" +#define GITREV 0x4153 +#define GITDATE 0x20200114 +#define GITBRANCH "4.1.1" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 77fe1704f..72a40397d 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: 38aad40fefaa1bb62785ba2770278cd805765930 -Revision: 871 -Branch: 4.1.1-rc +Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc +Revision: 872 +Branch: 4.1.1 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4150 -Last Changed Date: 2020-01-06 11:16:44.000000001 +0100 ./updateAPIVersion.sh +Last Changed Rev: 4153 +Last Changed Date: 2020-01-14 15:47:26.000000001 +0100 ./updateAPIVersion.sh diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 4bf2a8ca3..6c768c91d 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 "38aad40fefaa1bb62785ba2770278cd805765930" +#define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4150 -#define GITDATE 0x20200106 -#define GITBRANCH "4.1.1-rc" +#define GITREV 0x4153 +#define GITDATE 0x20200114 +#define GITBRANCH "4.1.1"