Merge branch 'main' into dev-7.5.0

2023-12-01 10:21:14 +01:00 · 2023-12-01 10:21:14 +01:00 · 99195565f6
commit 99195565f6
parent cf6c86fabc fa727b1e44
3 changed files with 6 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -22,6 +22,10 @@ will consitute of a breaking change warranting a new major release:

 # [v7.4.0] 2023-12-XX

+# [v7.4.0] 2023-11-30
+
+- `eive-tmtc` v5.11.0
+
 ## Changed

 - Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)

 set(OBSW_VERSION_MAJOR 7)
-set(OBSW_VERSION_MINOR 3)
+set(OBSW_VERSION_MINOR 4)
 set(OBSW_VERSION_REVISION 0)

 # set(CMAKE_VERBOSE TRUE)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 098843a74f93a7ec94500bc0fc9faa1abb165508
+Subproject commit 74e55b16dcca73023254493d911be3debc36adb2