detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-03 08:38:39 +01:00
Code Issues Actions Packages Releases Activity

conflict solved and merged with developer

Browse Source
This commit is contained in:
maliakal_d
2020-09-09 10:27:14 +02:00
parent f26d8e514b e8156d412e
commit bdac4d133e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

3
slsSupportLib/include/versionAPI.h
View File

@@ -6,7 +6,8 @@
#define APIEIGER 0x200908 #define APIEIGER 0x200908
#define APICTB 0x200908 #define APICTB 0x200908
#define APIGOTTHARD 0x200908 #define APIGOTTHARD 0x200908
#define APIGOTTHARD2 0x200908
#define APIJUNGFRAU 0x200908 #define APIJUNGFRAU 0x200908
#define APIMYTHEN3 0x200908 #define APIMYTHEN3 0x200908
#define APIMOENCH 0x200908 #define APIMOENCH 0x200908
#define APIGOTTHARD2 0x200909