Merge pull request 'v6.1.0' (#740) from prep_v6.1.0 into main

Reviewed-on: #740
2023-07-13 13:07:07 +02:00 · 2023-07-13 13:07:07 +02:00 · 70c4f8f3fd
commit 70c4f8f3fd
parent 546053f95a 1f44533b3e
3 changed files with 6 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:

 # [unreleased]

+# [v6.1.0] 2023-07-13
+
+- `eive-tmtc`: v5.2.0
+
 ## Changed

 - TCS: Remove OBC IF board thermal module, which is exactly identical to OBC module and therefore
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)

 set(OBSW_VERSION_MAJOR 6)
-set(OBSW_VERSION_MINOR 0)
+set(OBSW_VERSION_MINOR 1)
 set(OBSW_VERSION_REVISION 0)

 # set(CMAKE_VERBOSE TRUE)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9be81f1725004b55e937718fbaddc4f4e4e74081
+Subproject commit eea768358101a16912c0c49ad5e66a8c90826121