mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-06-04 07:38:41 +02:00
solved merge conflict
This commit is contained in:
@@ -3,11 +3,11 @@
|
||||
/** API versions */
|
||||
#define APILIB "0.0.0 0x250909"
|
||||
#define APIRECEIVER "0.0.0 0x250822"
|
||||
#define APICTB "0.0.0 0x260317"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260227"
|
||||
#define APIMOENCH "0.0.0 0x260227"
|
||||
#define APIEIGER "0.0.0 0x260227"
|
||||
#define APIXILINXCTB "0.0.0 0x260324"
|
||||
#define APIJUNGFRAU "0.0.0 0x260227"
|
||||
#define APIMYTHEN3 "0.0.0 0x260227"
|
||||
#define APICTB "0.0.0 0x260421"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260420"
|
||||
#define APIMOENCH "0.0.0 0x260420"
|
||||
#define APIEIGER "0.0.0 0x260420"
|
||||
#define APIXILINXCTB "0.0.0 0x260420"
|
||||
#define APIJUNGFRAU "0.0.0 0x260420"
|
||||
#define APIMYTHEN3 "0.0.0 0x260420"
|
||||
#define APIMATTERHORN "0.0.0 0x260212"
|
||||
Reference in New Issue
Block a user