diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 3606af8c7..96fd66c8d 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: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd -Revision: 454 -Branch: 3.1.3 +Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 +Revision: 455 +Branch: 3.1.4 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3475 -Last Changed Date: 2018-06-28 14:19:33.000000002 +0200 ./src/qTabSettings.cpp +Last Changed Rev: 3492 +Last Changed Date: 2018-08-17 16:36:24.000000002 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index 50b5e28ee..f64fea9c8 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 "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd" +#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3475 -#define GITDATE 0x20180628 -#define GITBRANCH "3.1.3" +#define GITREV 0x3492 +#define GITDATE 0x20180817 +#define GITBRANCH "3.1.4" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index 9de3d6335..dea05a5cd 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: d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960 -Revision: 1722 -Branch: 3.1.4-rc +Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 +Revision: 1726 +Branch: 3.1.4 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3483 -Last Changed Date: 2018-07-25 16:51:25.000000002 +0200 ./slsDetector/slsDetectorCommand.cpp +Last Changed Rev: 3492 +Last Changed Date: 2018-08-17 17:57:11.000000002 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 336fd0b23..f64fea9c8 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 "d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960" +#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3483 -#define GITDATE 0x20180725 -#define GITBRANCH "3.1.4-rc" +#define GITREV 0x3492 +#define GITDATE 0x20180817 +#define GITBRANCH "3.1.4" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 01ec6a186..6a44eedea 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: e599bfe56f512ea6a262483f61ffd8d67d6c6fcd -Revision: 710 -Branch: 3.1.3 +Repsitory UUID: 1b92b01a466aa1986b8198700274af75477a1e54 +Revision: 715 +Branch: 3.1.4 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3475 -Last Changed Date: 2018-06-28 14:19:34.000000002 +0200 ./src/UDPStandardImplementation.cpp +Last Changed Rev: 3492 +Last Changed Date: 2018-08-17 16:36:25.000000002 +0200 ./src/utilities.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index 50b5e28ee..f64fea9c8 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 "e599bfe56f512ea6a262483f61ffd8d67d6c6fcd" +#define GITREPUUID "1b92b01a466aa1986b8198700274af75477a1e54" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3475 -#define GITDATE 0x20180628 -#define GITBRANCH "3.1.3" +#define GITREV 0x3492 +#define GITDATE 0x20180817 +#define GITBRANCH "3.1.4"