merged with developer to fix conflicts

This commit is contained in:
2022-01-19 10:40:20 +01:00
5 changed files with 2 additions and 2 deletions

View File

@ -2,14 +2,14 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */ /** API versions */
#define GITBRANCH "developer" #define GITBRANCH "developer"
#define APILIB 0x211125 #define APILIB 0x211125
#define APIRECEIVER 0x211124 #define APIRECEIVER 0x211124
#define APIGUI 0x211124 #define APIGUI 0x211124
#define APIEIGER 0x220119
#define APICTB 0x220119 #define APICTB 0x220119
#define APIGOTTHARD 0x220119 #define APIGOTTHARD 0x220119
#define APIGOTTHARD2 0x220119 #define APIGOTTHARD2 0x220119
#define APIJUNGFRAU 0x220119 #define APIJUNGFRAU 0x220119
#define APIMYTHEN3 0x220119 #define APIMYTHEN3 0x220119
#define APIMOENCH 0x220119 #define APIMOENCH 0x220119
#define APIEIGER 0x220119