merge conflict from 3.0.1 to restream stop from recieveR

This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:19 +01:00
5 changed files with 23 additions and 5 deletions

View File

@ -617,6 +617,7 @@ void saveErrorSignal(QString);
void AcquisitionErrorSignal(QString);
void UpdatePlotSignal();
void GainPlotSignal(bool);
void AcquisitionFinishedSignal();
};