diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index fdf5d1d90..8aa4097c1 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: 7b70274d4f57977649e4f4a69c21238f335561fc -Revision: 527 -Branch: 4.0.2 +Repsitory UUID: 98b45b32fd6653fb2758afdc3f804e2a785c504d +Revision: 532 +Branch: 4.1.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4109 -Last Changed Date: 2019-06-13 08:55:33.000000002 +0200 ./src/qTabMeasurement.cpp +Last Changed Rev: 4141 +Last Changed Date: 2019-10-04 09:28:27.000000001 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 39be4e516..f2ca865cf 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 "7b70274d4f57977649e4f4a69c21238f335561fc" +#define GITREPUUID "98b45b32fd6653fb2758afdc3f804e2a785c504d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4109 -#define GITDATE 0x20190613 -#define GITBRANCH "4.0.2" +#define GITREV 0x4141 +#define GITDATE 0x20191004 +#define GITBRANCH "4.1.0" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 80127194c..db1d84d18 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: 7b70274d4f57977649e4f4a69c21238f335561fc -Revision: 2082 -Branch: 4.0.2 +Repsitory UUID: 98b45b32fd6653fb2758afdc3f804e2a785c504d +Revision: 2094 +Branch: 4.1.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4109 -Last Changed Date: 2019-06-13 09:00:22.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 4141 +Last Changed Date: 2019-10-04 10:33:35.000000001 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 39be4e516..f2ca865cf 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 "7b70274d4f57977649e4f4a69c21238f335561fc" +#define GITREPUUID "98b45b32fd6653fb2758afdc3f804e2a785c504d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4109 -#define GITDATE 0x20190613 -#define GITBRANCH "4.0.2" +#define GITREV 0x4141 +#define GITDATE 0x20191004 +#define GITBRANCH "4.1.0" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 520c30fbb..1e850fd64 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: 46533b041195591b1a09b2662895e084821ba886 -Revision: 863 -Branch: 4.0.2 +Repsitory UUID: 98b45b32fd6653fb2758afdc3f804e2a785c504d +Revision: 870 +Branch: 4.1.0 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4107 -Last Changed Date: 2019-06-12 14:40:27.000000002 +0200 ./updateAPIVersion.sh +Last Changed Rev: 4141 +Last Changed Date: 2019-10-04 09:28:28.000000001 +0200 ./updateAPIVersion.sh diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index a817c64c5..f2ca865cf 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 "46533b041195591b1a09b2662895e084821ba886" +#define GITREPUUID "98b45b32fd6653fb2758afdc3f804e2a785c504d" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4107 -#define GITDATE 0x20190612 -#define GITBRANCH "4.0.2" +#define GITREV 0x4141 +#define GITDATE 0x20191004 +#define GITBRANCH "4.1.0"