merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch

This commit is contained in:
2017-10-12 14:42:57 +02:00
11 changed files with 103 additions and 56 deletions

View File

@ -1,9 +1,10 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 1701b20218363d885a7dc62f92591c7e1f4e2f1c
Revision: 304
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1589
Last Changed Date: 2017-09-26 09:25:28.000000002 +0200 ./Beb.c
Repsitory UUID: a161a9aad8ac38a79ba43340344a3c923cea85f7
Revision: 307
Branch: 3.0.1
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 1578
Last Changed Date: 2017-10-11 12:45:54.679255119 +0200