diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 96fd66c8d..2b119b7ea 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: 1b92b01a466aa1986b8198700274af75477a1e54 -Revision: 455 -Branch: 3.1.4 +Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b +Revision: 456 +Branch: 3.1.5 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3492 -Last Changed Date: 2018-08-17 16:36:24.000000002 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 3498 +Last Changed Date: 2018-11-30 11:03:38.000000002 +0100 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index f64fea9c8..f569bd630 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 "1b92b01a466aa1986b8198700274af75477a1e54" +#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3492 -#define GITDATE 0x20180817 -#define GITBRANCH "3.1.4" +#define GITREV 0x3498 +#define GITDATE 0x20181130 +#define GITBRANCH "3.1.5" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index dea05a5cd..e63eb75ea 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: 1b92b01a466aa1986b8198700274af75477a1e54 -Revision: 1726 -Branch: 3.1.4 +Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b +Revision: 1730 +Branch: 3.1.5 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3492 -Last Changed Date: 2018-08-17 17:57:11.000000002 +0200 ./threadFiles/ThreadPool.o +Last Changed Rev: 3498 +Last Changed Date: 2018-11-30 15:26:47.000000002 +0100 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index f64fea9c8..f569bd630 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 "1b92b01a466aa1986b8198700274af75477a1e54" +#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3492 -#define GITDATE 0x20180817 -#define GITBRANCH "3.1.4" +#define GITREV 0x3498 +#define GITDATE 0x20181130 +#define GITBRANCH "3.1.5" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 6a44eedea..b035af4a9 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: 1b92b01a466aa1986b8198700274af75477a1e54 -Revision: 715 -Branch: 3.1.4 +Repsitory UUID: e094e41d89d91e341bc6cf272b4570145a82446b +Revision: 716 +Branch: 3.1.5 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3492 -Last Changed Date: 2018-08-17 16:36:25.000000002 +0200 ./src/utilities.cpp +Last Changed Rev: 3498 +Last Changed Date: 2018-11-30 11:03:41.000000002 +0100 ./src/utilities.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index f64fea9c8..f569bd630 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 "1b92b01a466aa1986b8198700274af75477a1e54" +#define GITREPUUID "e094e41d89d91e341bc6cf272b4570145a82446b" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3492 -#define GITDATE 0x20180817 -#define GITBRANCH "3.1.4" +#define GITREV 0x3498 +#define GITDATE 0x20181130 +#define GITBRANCH "3.1.5"