merge from 3.0 hotfixes done

This commit is contained in:
Dhanya Maliakal
2017-10-18 17:39:19 +02:00
6 changed files with 65 additions and 26 deletions

View File

@ -1,9 +1,10 @@
Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 27301393e82602889700db12ab68a0c67a6f9736
Revision: 657
Branch: 3.0.1
Repsitory UUID: 820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7
Revision: 658
Branch: hotfix2
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 662
Last Changed Date: 2017-09-20 16:20:57.000000002 +0200 ./src/UDPStandardImplementation.cpp
Last Changed Rev: 663
Last Changed Date: 2017-10-18 15:51:33.000000002 +0200 ./src/UDPStandardImplementation.cpp