Jakob.Meier 473aa805c0 resolved merge conflicts		2020-11-25 16:17:16 +01:00
..
GenericFactory.cpp	resolved merge conflicts	2020-11-25 16:17:16 +01:00
GenericFactory.h	restructured.. a bit	2020-11-20 18:10:39 +01:00