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

This commit is contained in:
Robin Müller 2020-06-10 22:45:04 +02:00
commit b2ed0edce0
1 changed files with 1 additions and 0 deletions

View File

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