Merge branch 'master' into release

This commit is contained in:
Dhanya Maliakal 2016-03-21 11:21:59 +01:00
commit f40691dcaf
5 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.03.11.0
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.0

View File

@ -1 +1 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.03
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv2.0.3

View File

@ -1 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.03
../slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.0.3

View File

@ -1 +1 @@
../slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.03
../slsDetectorSoftware/moenchDetectorServer/moenchDetectorServerv2.0.3

View File

@ -1 +1 @@
../slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.03
../slsDetectorSoftware/mythenDetectorServer/mythenDetectorServerv2.0.3