Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master

This commit is contained in:
2020-08-23 20:27:00 +02:00
471 changed files with 39160 additions and 39069 deletions

View File

@ -1,17 +1,10 @@
/**
* @file SystemObject.h
* @brief This file contains the definition of the SystemObject class.
* @date 07.11.2012
* @author Ulrich Mohr
*/
#ifndef SYSTEMOBJECT_H_
#define SYSTEMOBJECT_H_
#include <framework/events/Event.h>
#include <framework/events/EventReportingProxyIF.h>
#include <framework/objectmanager/SystemObjectIF.h>
#include <framework/timemanager/Clock.h>
#include "../events/Event.h"
#include "../events/EventReportingProxyIF.h"
#include "../objectmanager/SystemObjectIF.h"
#include "../timemanager/Clock.h"
/**
* @brief This class automates insertion into the ObjectManager and