Jakob Meier 8c850614e5 fixed merge conflicts		2022-06-05 10:54:46 +02:00
..
CMakeLists.txt	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
GenericFactory.cpp	fixed merge conflicts	2022-06-05 10:54:46 +02:00
GenericFactory.h	small fix for generic factory header	2022-05-03 17:45:39 +02:00