binaries resolved, merge conflict from developer

2025-06-13 05:17:13 +02:00 · 2020-09-10 10:19:34 +02:00
parent ecabc94ade 3cd4f3897b
commit 80b053eb10
8 changed files with 7 additions and 7 deletions
--- a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
+++ b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
--- a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
+++ b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
--- a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
+++ b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
--- a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
+++ b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
--- a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
+++ b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
--- a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
+++ b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@ -4,10 +4,10 @@
 #define APIRECEIVER  0x200810
 #define APIGUI       0x200804
-#define APICTB 0x200909
+#define APICTB 0x200910
-#define APIGOTTHARD 0x200909
+#define APIGOTTHARD 0x200910
-#define APIGOTTHARD2 0x200909
+#define APIGOTTHARD2 0x200910
-#define APIJUNGFRAU 0x200909
+#define APIJUNGFRAU 0x200910
-#define APIMYTHEN3 0x200909
+#define APIMYTHEN3 0x200910
-#define APIMOENCH 0x200909
+#define APIMOENCH 0x200910
-#define APIEIGER 0x200909
+#define APIEIGER 0x200910