Jakob Meier 9fc1e57943 fixed conflicts

2022-03-14 14:35:07 +01:00

..

CMakeLists.txt

reworked cmake, unfortunately a big one due to interdependence

2022-02-09 21:38:56 +01:00

GenericFactory.cpp

fixed conflicts

2022-03-14 14:35:07 +01:00

GenericFactory.h

applied formatting

2022-01-17 15:58:27 +01:00