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

merge conflict resolved from 4.0.0

Browse Source
This commit is contained in:
maliakal_d
2018-09-28 16:28:21 +02:00
parent c52025dd7c eb89d12f41
commit def79807f6
86 changed files with 1112 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "548036a602123cb3c06bbf4f9a40c9acd6c527fc"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3988
#define GITDATE 0x20180823
#define GITREPUUID "c52025dd7c4b44b93e64353a22997d971996ab18"
#define GITAUTH "Gemma_Tinti"
#define GITREV 0x3999
#define GITDATE 0x20180928
#define GITBRANCH "developer"