Commit Graph

2 Commits

Author SHA1 Message Date
91e0e9f233 Merge branch 'develop' into mohr/startracker
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Conflicts:
	CMakeLists.txt
	cmake/PreProjectConfig.cmake
	linux/fsfwconfig/events/translateEvents.cpp
2022-02-16 15:21:24 +01:00
Jakob Meier
e67bcd4e26 setup egse project 2022-02-05 13:19:20 +01:00