merge fix

This commit is contained in:
Dhanya Maliakal
2016-10-20 09:17:42 +02:00
parent 266506e67f
commit 0cd9261332
3 changed files with 16 additions and 89 deletions

View File

@ -502,13 +502,6 @@ class UDPInterface {
virtual int setActivate(int enable = -1) = 0;
/**
* Activate / Deactivate Receiver
* If deactivated, receiver will write dummy packets 0xFF
* (as it will receive nothing from detector)
*/
virtual int setActivate(int enable = -1) = 0;
//***callback functions***
/**
* Call back for start acquisition