Jakob.Meier d953a9ff32 fixed merge conflicts		2021-03-26 12:30:24 +01:00
..
systemObjectList.h	fixed merge conflicts	2021-03-26 12:30:24 +01:00
translateObjects.cpp	restructured.. a bit	2020-11-20 18:10:39 +01:00
translateObjects.h	restructured.. a bit	2020-11-20 18:10:39 +01:00