detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '4.0.0' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.0

Browse Source
This commit is contained in:
Erik Frojdh
2018-09-25 14:24:26 +02:00
parent 06d698166f 5a139d70b5
commit 6f0c505c01
12 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
serverBin/gotthardDetectorServerv4.0.0.1
View File

@ -1 +0,0 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.1

1
serverBin/gotthardDetectorServerv4.0.0.2 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.2

6
slsDetectorSoftware/commonFiles/versionAPI.h
View File

@ -1,5 +1,5 @@
/** API versions */ /** API versions */
#define APIRECEIVER 0x180718 #define APIRECEIVER 0x180823
#define APIEIGER 0x180820 #define APIEIGER 0x180820
#define APIJUNGFRAU 0x180820 #define APIJUNGFRAU 0x180823
#define APIGOTTHARD 0x180918 #define APIGOTTHARD 0x180925

8
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 9f84bf71759d607b957bcf1fc88eb22c59d8378a Repsitory UUID: 4aa0d26f26a16d48ddd265128f02b39e7140127f
Revision: 238 Revision: 239
Branch: 4.0.0 Branch: 4.0.0
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4004 Last Changed Rev: 4005
Last Changed Date: 2018-09-21 13:58:41.000000002 +0200 ./server_funcs.c Last Changed Date: 2018-09-25 12:19:12.000000002 +0200 ./server_funcs.h

6
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "9f84bf71759d607b957bcf1fc88eb22c59d8378a" #define GITREPUUID "4aa0d26f26a16d48ddd265128f02b39e7140127f"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4004 #define GITREV 0x4005
#define GITDATE 0x20180921 #define GITDATE 0x20180925
#define GITBRANCH "4.0.0" #define GITBRANCH "4.0.0"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.1
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.2 Executable file
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: b7f62fcd47f8c0a5c23b2073812adb9bba806ce9 Repsitory UUID: b163180d6f2505ff8a84f10e586cc2e0bbdaac86
Revision: 162 Revision: 163
Branch: 4.0.0-rc Branch: 4.0.0
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3990 Last Changed Rev: 4009
Last Changed Date: 2018-08-23 11:57:31.000000002 +0200 ./RegisterDefs.h Last Changed Date: 2018-09-25 12:19:12.000000002 +0200 ./RegisterDefs.h

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b7f62fcd47f8c0a5c23b2073812adb9bba806ce9" #define GITREPUUID "b163180d6f2505ff8a84f10e586cc2e0bbdaac86"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3990 #define GITREV 0x4009
#define GITDATE 0x20180823 #define GITDATE 0x20180925
#define GITBRANCH "4.0.0-rc" #define GITBRANCH "4.0.0"