Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements
This commit is contained in:
commit
ba8122f2db
@ -1,5 +1,6 @@
|
|||||||
#include <framework/objectmanager/ObjectManager.h>
|
#include <framework/objectmanager/ObjectManager.h>
|
||||||
#include <framework/serviceinterface/ServiceInterfaceStream.h>
|
#include <framework/serviceinterface/ServiceInterfaceStream.h>
|
||||||
|
#include <iomanip>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
ObjectManager::ObjectManager( void (*setProducer)() ):
|
ObjectManager::ObjectManager( void (*setProducer)() ):
|
||||||
|
Loading…
Reference in New Issue
Block a user