diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 16b79dc772..de217639bf 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: b389402d647e939342dbb2c9317c688c0eb6b105 -Revision: 452 -Branch: 3.1.0-rc -Last Changed Author: Erik_Frojdh -Last Changed Rev: 3458 -Last Changed Date: 2018-03-09 10:55:40.000000002 +0100 ./src/qTabSettings.cpp +Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 +Revision: 453 +Branch: 3.1.2 +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3474 +Last Changed Date: 2018-06-12 12:15:02.000000002 +0200 ./src/qTabSettings.cpp diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index cbbcf49dbc..f9b3c74d9c 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 "b389402d647e939342dbb2c9317c688c0eb6b105" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x3458 -#define GITDATE 0x20180309 -#define GITBRANCH "3.1.0-rc" +#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3474 +#define GITDATE 0x20180612 +#define GITBRANCH "3.1.2" diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt index be251be6fa..ea962c894a 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: 85aa47b8353bb84f52c435a967a03ddf46af5dd1 -Revision: 1716 -Branch: 3.1.1-rc +Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 +Revision: 1719 +Branch: 3.1.2 Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3465 -Last Changed Date: 2018-03-19 18:13:27.000000002 +0100 ./threadFiles/ThreadPool.o +Last Changed Rev: 3474 +Last Changed Date: 2018-06-12 12:23:39.000000002 +0200 ./threadFiles/ThreadPool.o diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h index 29b3f8b03a..f9b3c74d9c 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 "85aa47b8353bb84f52c435a967a03ddf46af5dd1" +#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3465 -#define GITDATE 0x20180319 -#define GITBRANCH "3.1.1-rc" +#define GITREV 0x3474 +#define GITDATE 0x20180612 +#define GITBRANCH "3.1.2" diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index d85227f14c..81874b1c36 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: b389402d647e939342dbb2c9317c688c0eb6b105 -Revision: 708 -Branch: 3.1.0-rc -Last Changed Author: Erik_Frojdh -Last Changed Rev: 3458 -Last Changed Date: 2018-03-09 12:23:14.000000002 +0100 ./src/Listener.cpp +Repsitory UUID: 764becc271a7292ace3ba84137d0dabae4e77bd0 +Revision: 709 +Branch: 3.1.2 +Last Changed Author: Dhanya_Thattil +Last Changed Rev: 3474 +Last Changed Date: 2018-06-12 12:15:03.000000002 +0200 ./src/UDPStandardImplementation.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index cbbcf49dbc..f9b3c74d9c 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 "b389402d647e939342dbb2c9317c688c0eb6b105" -#define GITAUTH "Erik_Frojdh" -#define GITREV 0x3458 -#define GITDATE 0x20180309 -#define GITBRANCH "3.1.0-rc" +#define GITREPUUID "764becc271a7292ace3ba84137d0dabae4e77bd0" +#define GITAUTH "Dhanya_Thattil" +#define GITREV 0x3474 +#define GITDATE 0x20180612 +#define GITBRANCH "3.1.2"