conflict resolution with developer

This commit is contained in:
Dhanya Maliakal
2017-10-03 15:12:56 +02:00
20 changed files with 220 additions and 27 deletions

View File

@ -261,6 +261,9 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
/** set streaming source ip */
int set_streaming_source_ip();
/** set silent mode */
int set_silent_mode();
/** enable gap pixels */
int enable_gap_pixels();