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

@@ -60,6 +60,7 @@ enum recFuncs{
F_SEND_RECEIVER_MULTIDETSIZE, /** < sets the multi detector size to the receiver */
F_SET_RECEIVER_STREAMING_PORT, /** < sets the receiver streaming port */
F_RECEIVER_STREAMING_SRC_IP, /** < sets the receiver streaming source IP */
F_SET_RECEIVER_SILENT_MODE, /** < sets the receiver silent mode */
F_ENABLE_GAPPIXELS_IN_RECEIVER, /** < sets gap pixels in the receiver */
/* Always append functions hereafter!!! */