Merge branch 'developer' into gappixels

This commit is contained in:
Dhanya Maliakal
2017-11-10 16:53:14 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.21.0

View File

@@ -1 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.10