merging refactor (replacing)

This commit is contained in:
2019-04-12 10:53:09 +02:00
parent 0bb800cc8a
commit 89a06f099c
1176 changed files with 82698 additions and 159058 deletions

4
slsReceiverSoftware/include/Fifo.h Normal file → Executable file
View File

@ -9,12 +9,12 @@
*@short constructs the fifo structure
*/
#include "sls_receiver_defs.h"
#include "sls_detector_defs.h"
#include "logger.h"
#include "circularFifo.h"
class Fifo : private virtual slsReceiverDefs {
class Fifo : private virtual slsDetectorDefs {
public:
/**