Merge remote-tracking branch 'upstream/master' into mueller_TmTcBridge_cherryPicked

This commit is contained in:
Robin Müller 2020-06-23 10:37:10 +02:00
commit d51b3b68e4

View File

@ -1,5 +1,6 @@
#include <framework/objectmanager/ObjectManager.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <iomanip>
#include <cstdlib>
ObjectManager::ObjectManager( void (*setProducer)() ):