eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Jakob Meier
2022-04-27 16:56:16 +02:00
parent 9301206485 7543a92dd9
commit 7682a1d214
28 changed files with 1286 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 194 translations.
* @details
* Generated on: 2022-04-18 16:58:03
* Generated on: 2022-04-27 16:45:31
*/
#include "translateEvents.h"

2
linux/fsfwconfig/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 116 translations.
* Generated on: 2022-04-18 16:58:07
* Generated on: 2022-04-27 16:45:35
*/
#include "translateObjects.h"