merge conflict from 3.0.1 to restream stop from recieveR

This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:47 +01:00
10 changed files with 102 additions and 3 deletions

View File

@ -267,6 +267,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
/** enable gap pixels */
int enable_gap_pixels();
/** restream stop packet */
int restream_stop();
/** detector type */