mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-13 22:01:40 +01:00
solving merging conflicts from 3.1.0 to developer
This commit is contained in:
1
serverBin/eigerDetectorServer_virtualMaster
Symbolic link
1
serverBin/eigerDetectorServer_virtualMaster
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
|
||||
1
serverBin/eigerDetectorServer_virtualSlave
Symbolic link
1
serverBin/eigerDetectorServer_virtualSlave
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
|
||||
1
serverBin/eigerDetectorServerv3.1.0.16.1
Symbolic link
1
serverBin/eigerDetectorServerv3.1.0.16.1
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.16.1
|
||||
1
serverBin/gotthardDetectorServer_virtual
Symbolic link
1
serverBin/gotthardDetectorServer_virtual
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual
|
||||
@@ -1 +0,0 @@
|
||||
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6
|
||||
1
serverBin/gotthardDetectorServerv3.1.0.1
Symbolic link
1
serverBin/gotthardDetectorServerv3.1.0.1
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.1
|
||||
1
serverBin/jungfrauDetectorServer_virtual
Symbolic link
1
serverBin/jungfrauDetectorServer_virtual
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
|
||||
1
serverBin/jungfrauDetectorServerv3.1.0.2
Symbolic link
1
serverBin/jungfrauDetectorServerv3.1.0.2
Symbolic link
@@ -0,0 +1 @@
|
||||
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.1.0.2
|
||||
@@ -1 +0,0 @@
|
||||
../slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3
|
||||
Reference in New Issue
Block a user