Jakob.Meier 668d4c0674 fixed merge conflict		2020-12-27 15:32:16 +01:00
..
GenericFactory.cpp	fixed merge conflict	2020-12-27 15:32:16 +01:00
GenericFactory.h	restructured.. a bit	2020-11-20 18:10:39 +01:00