detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 23:28:04 +01:00
Code Issues Actions Packages Releases Activity

solving merging conflicts from 3.1.0 to developer

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 15:45:35 +01:00
parent 06cdf8ad92 85aa47b835
commit b58c3e8951
129 changed files with 1120 additions and 8750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 897cbac27d3154d72893e331df3147d4b706ccc8
Revision: 321
Repsitory UUID: 06cdf8ad9204fd306cb1017b91e67452c61715d4
Revision: 323
Branch: developer
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3600
Last Changed Date: 2018-02-07 15:22:30.000000002 +0100 ./FebRegisterDefs.h
Last Changed Author: Erik_Frojdh
Last Changed Rev: 3671
Last Changed Date: 2018-03-13 10:28:12.000000002 +0100 ./FebRegisterDefs.h

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "897cbac27d3154d72893e331df3147d4b706ccc8"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3600
#define GITDATE 0x20180207
#define GITREPUUID "06cdf8ad9204fd306cb1017b91e67452c61715d4"
#define GITAUTH "Erik_Frojdh"
#define GITREV 0x3671
#define GITDATE 0x20180313
#define GITBRANCH "developer"