Jakob.Meier 473aa805c0 resolved merge conflicts

2020-11-25 16:17:16 +01:00

..

cdatapool

restructured.. a bit

2020-11-20 18:10:39 +01:00

devices

restructured.. a bit

2020-11-20 18:10:39 +01:00

events

restructured.. a bit

2020-11-20 18:10:39 +01:00

ipc

restructured.. a bit

2020-11-20 18:10:39 +01:00

objects

resolved merge conflicts

2020-11-25 16:17:16 +01:00

pollingsequence

restructured.. a bit

2020-11-20 18:10:39 +01:00

returnvalues

restructured.. a bit

2020-11-20 18:10:39 +01:00

tmtc

restructured.. a bit

2020-11-20 18:10:39 +01:00

FSFWConfig.h

restructured.. a bit

2020-11-20 18:10:39 +01:00

fsfwconfig.mk

restructured.. a bit

2020-11-20 18:10:39 +01:00

OBSWConfig.h

resolved merge conflicts

2020-11-25 16:17:16 +01:00

OBSWVersion.h

todo added

2020-11-20 18:32:06 +01:00