detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

resolved conflicts from merging 3.1.1 in here

Browse Source
This commit is contained in:
maliakal_d
2018-03-21 09:03:31 +01:00
parent 98752e1cdb 17c20748bc
commit a36b715eab
22 changed files with 61 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gitInfo.txt
View File

@ -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: b58c3e8951625ed9124669404f6b68aca340a1b8
Revision: 1842
Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7
Revision: 1846
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3727
Last Changed Date: 2018-03-14 16:10:22.000000002 +0100 ./multiSlsDetector/multiSlsDetector.cpp
Last Changed Author: Gemma_Tinti
Last Changed Rev: 3733
Last Changed Date: 2018-03-21 09:01:24.000000002 +0100 ./threadFiles/ThreadPool.o