Jakob.Meier a2e62b28c3 fixed merge conflicts

2021-07-23 17:48:11 +02:00

..

config

fixed merge conflicts

2021-07-23 17:48:11 +02:00

CMakeLists.txt

moved some files

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