Jakob.Meier 97f36a6ac7 fixed merge conflicts

2021-07-23 14:36:15 +02:00

..

config

fixed merge conflicts

2021-07-23 14:36:15 +02:00

CMakeLists.txt

moved some files

2021-03-04 18:29:28 +01:00