detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07: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/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 06cdf8ad9204fd306cb1017b91e67452c61715d4
Revision: 122
Repsitory UUID: 98752e1cdbd78167ad20c6a01a17852b1a2263a7
Revision: 133
Branch: developer
Last Changed Author: Erik_Frojdh
Last Changed Rev: 3671
Last Changed Date: 2018-03-13 10:29:31.000000002 +0100 ./Makefile.virtual
Last Changed Author: Gemma_Tinti
Last Changed Rev: 3733
Last Changed Date: 2018-03-21 08:34:29.000000002 +0100 ./RegisterDefs.h