Jakob Meier 9fc1e57943 fixed conflicts		2022-03-14 14:35:07 +01:00
..
devicedefinitions	fixed conflicts	2022-03-14 14:35:07 +01:00
ploc	fixed conflicts	2022-03-14 14:35:07 +01:00
CMakeLists.txt	fixed conflicts	2022-03-14 14:35:07 +01:00