detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-15 22:37:14 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '4.1.1' of github.com:slsdetectorgroup/slsDetectorPackage into 4.1.1

Browse Source
This commit is contained in:
Erik Frojdh
2020-01-14 16:25:57 +01:00
parent d14c9600bb 42971c94b7
commit eca2836703
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/slsDetectorGui
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc
Revision: 535 Revision: 536
Branch: 4.1.1-rc Branch: 4.1.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4150 Last Changed Rev: 4153
Last Changed Date: 2020-01-06 11:16:42.000000001 +0100 ./src/qTabSettings.cpp Last Changed Date: 2020-01-14 15:47:24.000000001 +0100 ./src/qTabSettings.cpp

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4150 #define GITREV 0x4153
#define GITDATE 0x20200106 #define GITDATE 0x20200114
#define GITBRANCH "4.1.1-rc" #define GITBRANCH "4.1.1"

10
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc
Revision: 2099 Revision: 2101
Branch: 4.1.1-rc Branch: 4.1.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4150 Last Changed Rev: 4153
Last Changed Date: 2020-01-06 18:59:33.000000001 +0100 ./threadFiles/ThreadPool.o Last Changed Date: 2020-01-14 16:16:00.000000001 +0100 ./threadFiles/ThreadPool.o

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4150 #define GITREV 0x4153
#define GITDATE 0x20200106 #define GITDATE 0x20200114
#define GITBRANCH "4.1.1-rc" #define GITBRANCH "4.1.1"

10
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 38aad40fefaa1bb62785ba2770278cd805765930 Repsitory UUID: b0fd4f4c44ac378744e724cce684aca4a56fe0fc
Revision: 871 Revision: 872
Branch: 4.1.1-rc Branch: 4.1.1
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4150 Last Changed Rev: 4153
Last Changed Date: 2020-01-06 11:16:44.000000001 +0100 ./updateAPIVersion.sh Last Changed Date: 2020-01-14 15:47:26.000000001 +0100 ./updateAPIVersion.sh

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "38aad40fefaa1bb62785ba2770278cd805765930" #define GITREPUUID "b0fd4f4c44ac378744e724cce684aca4a56fe0fc"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4150 #define GITREV 0x4153
#define GITDATE 0x20200106 #define GITDATE 0x20200114
#define GITBRANCH "4.1.1-rc" #define GITBRANCH "4.1.1"