Martin Zietz 88138af39d solved all merge conflicts

2021-03-22 13:09:06 +01:00

..

systemObjectList.h

solved all merge conflicts

2021-03-22 13:09:06 +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