diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 8aa4097c1..b1ca2f795 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: 98b45b32fd6653fb2758afdc3f804e2a785c504d -Revision: 532 -Branch: 4.1.0 +Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 +Revision: 535 +Branch: 4.1.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4141 -Last Changed Date: 2019-10-04 09:28:27.000000001 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 4150 +Last Changed Date: 2020-01-06 11:16:42.000000001 +0100 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index f2ca865cf..4bf2a8ca3 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 "98b45b32fd6653fb2758afdc3f804e2a785c504d" +#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4141 -#define GITDATE 0x20191004 -#define GITBRANCH "4.1.0" +#define GITREV 0x4150 +#define GITDATE 0x20200106 +#define GITBRANCH "4.1.1-rc" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index db1d84d18..ba4f34823 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: 98b45b32fd6653fb2758afdc3f804e2a785c504d -Revision: 2094 -Branch: 4.1.0 +Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 +Revision: 2099 +Branch: 4.1.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4141 -Last Changed Date: 2019-10-04 10:33:35.000000001 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 4150 +Last Changed Date: 2020-01-06 18:59:33.000000001 +0100 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index f2ca865cf..4bf2a8ca3 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 "98b45b32fd6653fb2758afdc3f804e2a785c504d" +#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4141 -#define GITDATE 0x20191004 -#define GITBRANCH "4.1.0" +#define GITREV 0x4150 +#define GITDATE 0x20200106 +#define GITBRANCH "4.1.1-rc" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 1e850fd64..77fe1704f 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: 98b45b32fd6653fb2758afdc3f804e2a785c504d -Revision: 870 -Branch: 4.1.0 +Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 +Revision: 871 +Branch: 4.1.1-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4141 -Last Changed Date: 2019-10-04 09:28:28.000000001 +0200 ./updateAPIVersion.sh +Last Changed Rev: 4150 +Last Changed Date: 2020-01-06 11:16:44.000000001 +0100 ./updateAPIVersion.sh diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index f2ca865cf..4bf2a8ca3 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 "98b45b32fd6653fb2758afdc3f804e2a785c504d" +#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4141 -#define GITDATE 0x20191004 -#define GITBRANCH "4.1.0" +#define GITREV 0x4150 +#define GITDATE 0x20200106 +#define GITBRANCH "4.1.1-rc"