From 881f9ea7ea7a03957ebb6fd1ebc06b1274f1d9a6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 8 Feb 2023 14:52:11 +0100 Subject: [PATCH] prep v1.26.0 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- tmtc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57920507..dd207914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ change warranting a new major release: # [unreleased] +# [v1.26.0] 2023-02-08 + +eive-tmtc v2.12.1 + ## Changed ### ACS diff --git a/CMakeLists.txt b/CMakeLists.txt index f5220063..8672db5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 1) -set(OBSW_VERSION_MINOR 25) +set(OBSW_VERSION_MINOR 26) set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) diff --git a/tmtc b/tmtc index 9955295d..d0c8e20d 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 9955295dfe16a9e0da7dee273c0abd502307eb64 +Subproject commit d0c8e20d4f9a6f5aee3ccfa05c4f7ab7151400b5