merging renaming into main branch

This commit is contained in:
2020-05-17 01:17:11 +02:00
parent b673e13892
commit cbfa21d45a
47 changed files with 2465 additions and 1253 deletions

View File

@ -1,9 +1,9 @@
#ifndef CONTROLLERSET_H_
#define CONTROLLERSET_H_
#include <framework/datapool/DataSet.h>
#include <framework/datapoolglob/GlobalDataSet.h>
class ControllerSet :public DataSet {
class ControllerSet :public GlobDataSet {
public:
ControllerSet();
virtual ~ControllerSet();